[1/3] cassandra git commit: Fix misplaced 2.2 upgrading section

2015-12-21 Thread slebresne
Repository: cassandra
Updated Branches:
  refs/heads/trunk c0fd119ce -> e67246255


Fix misplaced 2.2 upgrading section


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7afbaf71
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7afbaf71
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7afbaf71

Branch: refs/heads/trunk
Commit: 7afbaf714f93e4fdcba7b166bd0b07fa788b77ae
Parents: c26b397
Author: Sylvain Lebresne 
Authored: Mon Dec 21 09:28:11 2015 +0100
Committer: Sylvain Lebresne 
Committed: Mon Dec 21 09:28:20 2015 +0100

--
 NEWS.txt | 69 ++-
 1 file changed, 35 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7afbaf71/NEWS.txt
--
diff --git a/NEWS.txt b/NEWS.txt
index e220357..7c6af4c 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -197,40 +197,6 @@ New features
  to stop working: jps, jstack, jinfo, jmc, jcmd as well as 3rd party tools 
like Jolokia.
  If you wish to use these tools you can comment this flag out in 
cassandra-env.{sh,ps1}
 
-
-2.1.10
-=
-
-New features
-
-   - The syntax TRUNCATE TABLE X is now accepted as an alias for TRUNCATE X
-
-
-2.1.9
-=
-
-Upgrading
--
-- cqlsh will now display timestamps with a UTC timezone. Previously,
-  timestamps were displayed with the local timezone.
-- Commit log files are no longer recycled by default, due to negative
-  performance implications. This can be enabled again with the 
-  commitlog_segment_recycling option in your cassandra.yaml 
-- JMX methods set/getCompactionStrategyClass have been deprecated, use
-  set/getCompactionParameters/set/getCompactionParametersJson instead
-
-2.1.8
-=
-
-Upgrading
--
-- Nothing specific to this release, but please see 2.1 if you are upgrading
-  from a previous version.
-
-
-2.1.7
-=
-
 Upgrading
 -
- Thrift rpc is no longer being started by default.
@@ -278,6 +244,41 @@ Upgrading
  to exclude data centers when the global status is enabled, see 
CASSANDRA-9035 for details.
 
 
+2.1.10
+=
+
+New features
+
+   - The syntax TRUNCATE TABLE X is now accepted as an alias for TRUNCATE X
+
+
+2.1.9
+=
+
+Upgrading
+-
+- cqlsh will now display timestamps with a UTC timezone. Previously,
+  timestamps were displayed with the local timezone.
+- Commit log files are no longer recycled by default, due to negative
+  performance implications. This can be enabled again with the 
+  commitlog_segment_recycling option in your cassandra.yaml 
+- JMX methods set/getCompactionStrategyClass have been deprecated, use
+  set/getCompactionParameters/set/getCompactionParametersJson instead
+
+2.1.8
+=
+
+Upgrading
+-
+- Nothing specific to this release, but please see 2.1 if you are upgrading
+  from a previous version.
+
+
+2.1.7
+=
+
+
+
 2.1.6
 =
 



[1/2] cassandra git commit: Fix misplaced 2.2 upgrading section

2015-12-21 Thread slebresne
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 0e63000c3 -> 11165f473


Fix misplaced 2.2 upgrading section


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7afbaf71
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7afbaf71
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7afbaf71

Branch: refs/heads/cassandra-3.0
Commit: 7afbaf714f93e4fdcba7b166bd0b07fa788b77ae
Parents: c26b397
Author: Sylvain Lebresne 
Authored: Mon Dec 21 09:28:11 2015 +0100
Committer: Sylvain Lebresne 
Committed: Mon Dec 21 09:28:20 2015 +0100

--
 NEWS.txt | 69 ++-
 1 file changed, 35 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7afbaf71/NEWS.txt
--
diff --git a/NEWS.txt b/NEWS.txt
index e220357..7c6af4c 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -197,40 +197,6 @@ New features
  to stop working: jps, jstack, jinfo, jmc, jcmd as well as 3rd party tools 
like Jolokia.
  If you wish to use these tools you can comment this flag out in 
cassandra-env.{sh,ps1}
 
-
-2.1.10
-=
-
-New features
-
-   - The syntax TRUNCATE TABLE X is now accepted as an alias for TRUNCATE X
-
-
-2.1.9
-=
-
-Upgrading
--
-- cqlsh will now display timestamps with a UTC timezone. Previously,
-  timestamps were displayed with the local timezone.
-- Commit log files are no longer recycled by default, due to negative
-  performance implications. This can be enabled again with the 
-  commitlog_segment_recycling option in your cassandra.yaml 
-- JMX methods set/getCompactionStrategyClass have been deprecated, use
-  set/getCompactionParameters/set/getCompactionParametersJson instead
-
-2.1.8
-=
-
-Upgrading
--
-- Nothing specific to this release, but please see 2.1 if you are upgrading
-  from a previous version.
-
-
-2.1.7
-=
-
 Upgrading
 -
- Thrift rpc is no longer being started by default.
@@ -278,6 +244,41 @@ Upgrading
  to exclude data centers when the global status is enabled, see 
CASSANDRA-9035 for details.
 
 
+2.1.10
+=
+
+New features
+
+   - The syntax TRUNCATE TABLE X is now accepted as an alias for TRUNCATE X
+
+
+2.1.9
+=
+
+Upgrading
+-
+- cqlsh will now display timestamps with a UTC timezone. Previously,
+  timestamps were displayed with the local timezone.
+- Commit log files are no longer recycled by default, due to negative
+  performance implications. This can be enabled again with the 
+  commitlog_segment_recycling option in your cassandra.yaml 
+- JMX methods set/getCompactionStrategyClass have been deprecated, use
+  set/getCompactionParameters/set/getCompactionParametersJson instead
+
+2.1.8
+=
+
+Upgrading
+-
+- Nothing specific to this release, but please see 2.1 if you are upgrading
+  from a previous version.
+
+
+2.1.7
+=
+
+
+
 2.1.6
 =
 



cassandra git commit: Fix misplaced 2.2 upgrading section

2015-12-21 Thread slebresne
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 c26b39716 -> 7afbaf714


Fix misplaced 2.2 upgrading section


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7afbaf71
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7afbaf71
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7afbaf71

Branch: refs/heads/cassandra-2.2
Commit: 7afbaf714f93e4fdcba7b166bd0b07fa788b77ae
Parents: c26b397
Author: Sylvain Lebresne 
Authored: Mon Dec 21 09:28:11 2015 +0100
Committer: Sylvain Lebresne 
Committed: Mon Dec 21 09:28:20 2015 +0100

--
 NEWS.txt | 69 ++-
 1 file changed, 35 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7afbaf71/NEWS.txt
--
diff --git a/NEWS.txt b/NEWS.txt
index e220357..7c6af4c 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -197,40 +197,6 @@ New features
  to stop working: jps, jstack, jinfo, jmc, jcmd as well as 3rd party tools 
like Jolokia.
  If you wish to use these tools you can comment this flag out in 
cassandra-env.{sh,ps1}
 
-
-2.1.10
-=
-
-New features
-
-   - The syntax TRUNCATE TABLE X is now accepted as an alias for TRUNCATE X
-
-
-2.1.9
-=
-
-Upgrading
--
-- cqlsh will now display timestamps with a UTC timezone. Previously,
-  timestamps were displayed with the local timezone.
-- Commit log files are no longer recycled by default, due to negative
-  performance implications. This can be enabled again with the 
-  commitlog_segment_recycling option in your cassandra.yaml 
-- JMX methods set/getCompactionStrategyClass have been deprecated, use
-  set/getCompactionParameters/set/getCompactionParametersJson instead
-
-2.1.8
-=
-
-Upgrading
--
-- Nothing specific to this release, but please see 2.1 if you are upgrading
-  from a previous version.
-
-
-2.1.7
-=
-
 Upgrading
 -
- Thrift rpc is no longer being started by default.
@@ -278,6 +244,41 @@ Upgrading
  to exclude data centers when the global status is enabled, see 
CASSANDRA-9035 for details.
 
 
+2.1.10
+=
+
+New features
+
+   - The syntax TRUNCATE TABLE X is now accepted as an alias for TRUNCATE X
+
+
+2.1.9
+=
+
+Upgrading
+-
+- cqlsh will now display timestamps with a UTC timezone. Previously,
+  timestamps were displayed with the local timezone.
+- Commit log files are no longer recycled by default, due to negative
+  performance implications. This can be enabled again with the 
+  commitlog_segment_recycling option in your cassandra.yaml 
+- JMX methods set/getCompactionStrategyClass have been deprecated, use
+  set/getCompactionParameters/set/getCompactionParametersJson instead
+
+2.1.8
+=
+
+Upgrading
+-
+- Nothing specific to this release, but please see 2.1 if you are upgrading
+  from a previous version.
+
+
+2.1.7
+=
+
+
+
 2.1.6
 =