Merge branch cassandra-2.1 into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b45cb104
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b45cb104
Diff: http://git-wip-us.apache.org/repos/asf/c
Merge branch cassandra-2.1 into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e06dae81
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e06dae81
Diff: http://git-wip-us.apache.org/repos/asf/c
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2e4a8490
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e4a8490
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch cassandra-2.1 into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7550ebd9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7550ebd9
Diff: http://git-wip-us.apache.org/repos/asf/c
http://git-wip-us.apache.org/repos/asf/cassandra/blob/57d558fc/pylib/cqlshlib/copyutil.py
--
diff --cc pylib/cqlshlib/copyutil.py
index a2fab00,f699e64..a117ec3
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@@
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3841f9cb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3841f9cb
Diff: http://git-wip-us.apache.org/repos/asf
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1142183f/bin/cqlsh.py
--
diff --cc bin/cqlsh.py
index 41672c0,000..ffcbcbd
mode 100644,00..100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -1,2690 -1,0 +1,2699 @@@
+#!
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0fd5178/bin/cqlsh.py
--
diff --cc bin/cqlsh.py
index 94c7af3,000..41672c0
mode 100644,00..100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -1,2674 -1,0 +1,2690 @@@
+#!
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2f243ee/pylib/cqlshlib/copy.py
--
diff --cc pylib/cqlshlib/copy.py
index 000,8534b98..8ff474f
mode 00,100644..100644
--- a/pylib/cqlshlib/copy.py
+++ b/pylib/cqlshlib/c
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d434a33a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d434a33a
Diff: http://git-wip-us.apache.org/repos/asf
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb429063/pylib/cqlshlib/tracing.py
--
diff --cc pylib/cqlshlib/tracing.py
index 40d22f0,40d22f0..2ded259
--- a/pylib/cqlshlib/tracing.py
+++ b/pylib/cqlshlib/tracing.py
@@@ -20,
Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be89dae3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be89dae3
Diff: http:/
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/05183725
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05183725
Diff: http://git-wip-us.apache.org/repos/asf
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eecfb07d/doc/cql3/CQL.textile
--
diff --cc doc/cql3/CQL.textile
index ce712be,cc041df..aa0468b
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@@ -1,6 -1,6 +1,7 @@@
Merge branch cassandra-2.1 into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/67ebf665
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/67ebf665
Diff: http://git-wip-us.apache.org/repos/asf/c
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ab6e4854
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ab6e4854
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a11f9b6f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a11f9b6f
Diff: http://git-wip-us.apache.org/repos/asf
17 matches
Mail list logo