cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [2/3] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Fri, 22 May 2015 22:41:31 GMT
Merge branch 'cassandra-2.1' into cassandra-2.2

Conflicts:
	CHANGES.txt
	pylib/cqlshlib/formatting.py


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

Branch: refs/heads/trunk
Commit: 321f5e82f3083927d642416f1f51e54476225437
Parents: 4900538 7f855d1
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Fri May 22 17:40:58 2015 -0500
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Fri May 22 17:40:58 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                  | 1 +
 pylib/cqlshlib/formatting.py | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/321f5e82/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ca87385,a4430c0..d4a8150
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 -2.1.6
 +2.2
 + * Extend Transactional API to sstable lifecycle management (CASSANDRA-8568)
 + * (cqlsh) Add support for native protocol 4 (CASSANDRA-9399)
 + * Ensure that UDF and UDAs are keyspace-isolated (CASSANDRA-9409)
 + * Revert CASSANDRA-7807 (tracing completion client notifications) (CASSANDRA-9429)
 + * Add ability to stop compaction by ID (CASSANDRA-7207)
 +Merged from 2.1:
+  * (cqlsh) Better float precision by default (CASSANDRA-9224)
   * Improve estimated row count (CASSANDRA-9107)
   * Optimize range tombstone memory footprint (CASSANDRA-8603)
   * Use configured gcgs in anticompaction (CASSANDRA-9397)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/321f5e82/pylib/cqlshlib/formatting.py
----------------------------------------------------------------------
diff --cc pylib/cqlshlib/formatting.py
index 2310fa9,2a99e23..c0c3163
--- a/pylib/cqlshlib/formatting.py
+++ b/pylib/cqlshlib/formatting.py
@@@ -14,11 -14,11 +14,11 @@@
  # See the License for the specific language governing permissions and
  # limitations under the License.
  
 -import sys
 -import re
 -import time
  import calendar
  import math
 +import re
- import time
 +import sys
++import time
  from collections import defaultdict
  from . import wcwidth
  from .displaying import colorme, FormattedValue, DEFAULT_VALUE_COLORS


Mime
View raw message