Merge branch 'master' of https://github.com/gilv/spark

Conflicts: docs/openstack-integration.md
avulanov · Jun 10, 2014 · c977658 · c977658
2 parents 2aba763 + 9b625b5
commit c977658
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/docs/openstack-integration.md b/docs/openstack-integration.md
@@ -10,9 +10,7 @@ URI of the form `swift://<container.service_provider>/path`. You will also need
 Swift security credentials, through `SparkContext.hadoopConfiguration`. 
 
 #Configuring Hadoop to use Openstack Swift
-Openstack Swift driver was merged in Hadoop verion 2.3.0 ([Swift driver]
-(https://issues.apache.org/jira/browse/HADOOP-8545)).  Users that wish to use previous 
-Hadoop versions will need to configure Swift driver manually. Current Swift driver 
+Openstack Swift driver was merged in Hadoop verion 2.3.0 ([Swift driver](https://issues.apache.org/jira/browse/HADOOP-8545)).  Users that wish to use previous Hadoop versions will need to configure Swift driver manually. Current Swift driver 
 requieres Swift to use Keystone authentication method. There are recent efforts to support 
 also temp auth [Hadoop-10420](https://issues.apache.org/jira/browse/HADOOP-10420).
 To configure Hadoop to work with Swift one need to modify core-sites.xml of Hadoop and