You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/05/31 00:52:38 UTC
[1/3] git commit: Upgrade to Pig 0.12.1
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 d93572d5c -> e56a64edb
refs/heads/trunk 826271118 -> ce248f227
Upgrade to Pig 0.12.1
Patch by brandonwilliams for CASSANDRA-6556
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e56a64ed
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e56a64ed
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e56a64ed
Branch: refs/heads/cassandra-2.1
Commit: e56a64edb02c0aebae783ddcc72443ff1395126b
Parents: d93572d
Author: Brandon Williams <br...@apache.org>
Authored: Fri May 30 17:52:08 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri May 30 17:52:08 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
build.xml | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e56a64ed/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a849897..af4da65 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,9 @@
2.1.0
+ * Upgrade to Pig 0.12.1 (CASSANDRA-6556)
Merged from 2.0:
* Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
Merged from 1.2:
-* Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328)
+ * Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328)
2.1.0-rc1
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e56a64ed/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index bda7492..9f373c4 100644
--- a/build.xml
+++ b/build.xml
@@ -383,7 +383,7 @@
<exclusion groupId="org.mortbay.jetty" artifactId="servlet-api"/>
</dependency>
<dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster" version="1.0.3"/>
- <dependency groupId="org.apache.pig" artifactId="pig" version="0.11.1"/>
+ <dependency groupId="org.apache.pig" artifactId="pig" version="0.12.1"/>
<dependency groupId="net.java.dev.jna" artifactId="jna" version="4.0.0"/>
<dependency groupId="net.sourceforge.cobertura" artifactId="cobertura" version="${cobertura.version}">
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ce248f22
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ce248f22
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ce248f22
Branch: refs/heads/trunk
Commit: ce248f227b0238ed139f7d325689d036ee5bb6f9
Parents: 8262711 e56a64e
Author: Brandon Williams <br...@apache.org>
Authored: Fri May 30 17:52:32 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri May 30 17:52:32 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
build.xml | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce248f22/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index be9c2ee,af4da65..3dcc98b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
+3.0
+ * Move sstable RandomAccessReader to nio2, which allows using the
+ FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
+ * Remove CQL2 (CASSANDRA-5918)
+ * Add Thrift get_multi_slice call (CASSANDRA-6757)
+ * Optimize fetching multiple cells by name (CASSANDRA-6933)
+ * Allow compilation in java 8 (CASSANDRA-7208)
+ * Make incremental repair default (CASSANDRA-7250)
+
+
2.1.0
+ * Upgrade to Pig 0.12.1 (CASSANDRA-6556)
Merged from 2.0:
* Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
Merged from 1.2:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce248f22/build.xml
----------------------------------------------------------------------
[2/3] git commit: Upgrade to Pig 0.12.1
Posted by br...@apache.org.
Upgrade to Pig 0.12.1
Patch by brandonwilliams for CASSANDRA-6556
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e56a64ed
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e56a64ed
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e56a64ed
Branch: refs/heads/trunk
Commit: e56a64edb02c0aebae783ddcc72443ff1395126b
Parents: d93572d
Author: Brandon Williams <br...@apache.org>
Authored: Fri May 30 17:52:08 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri May 30 17:52:08 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
build.xml | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e56a64ed/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a849897..af4da65 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,9 @@
2.1.0
+ * Upgrade to Pig 0.12.1 (CASSANDRA-6556)
Merged from 2.0:
* Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
Merged from 1.2:
-* Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328)
+ * Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328)
2.1.0-rc1
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e56a64ed/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index bda7492..9f373c4 100644
--- a/build.xml
+++ b/build.xml
@@ -383,7 +383,7 @@
<exclusion groupId="org.mortbay.jetty" artifactId="servlet-api"/>
</dependency>
<dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster" version="1.0.3"/>
- <dependency groupId="org.apache.pig" artifactId="pig" version="0.11.1"/>
+ <dependency groupId="org.apache.pig" artifactId="pig" version="0.12.1"/>
<dependency groupId="net.java.dev.jna" artifactId="jna" version="4.0.0"/>
<dependency groupId="net.sourceforge.cobertura" artifactId="cobertura" version="${cobertura.version}">