You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by aw...@apache.org on 2019/02/13 18:32:18 UTC

[cassandra] branch cassandra-3.11 updated (123113f -> 4013eac)

This is an automated email from the ASF dual-hosted git repository.

aweisberg pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


    from 123113f  Update version to 3.11.5
     new 4f2fe19  Add missing commands to nodetool-completion
     new 4013eac  Merge branch 'cassandra-3.0' into cassandra-3.11

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGES.txt                |  1 +
 debian/nodetool-completion | 51 ++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 43 insertions(+), 9 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11

Posted by aw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

aweisberg pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 4013eacd9dd50772338c4df63d3c366000d35f82
Merge: 123113f 4f2fe19
Author: Ariel Weisberg <aw...@apple.com>
AuthorDate: Wed Feb 13 12:57:59 2019 -0500

    Merge branch 'cassandra-3.0' into cassandra-3.11

 CHANGES.txt                |  1 +
 debian/nodetool-completion | 51 ++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 43 insertions(+), 9 deletions(-)

diff --cc CHANGES.txt
index ffa90ed,5e8845f..7d27ea9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.19
 - * Add missing commands to nodetool-completion (CASSANDRA-14916)
 +3.11.5
 + Merged from 3.0:
++ * Add missing commands to nodetool_completion (CASSANDRA-14916)
   * Anti-compaction temporarily corrupts sstable state for readers (CASSANDRA-15004)
   Merged from 2.2:
   * Multi-version in-JVM dtests (CASSANDRA-14937)
diff --cc debian/nodetool-completion
index 7dc35de,f6f3d5b..732f4f4
--- a/debian/nodetool-completion
+++ b/debian/nodetool-completion
@@@ -68,10 -69,15 +69,17 @@@ have nodetool && have cqlsh &
              enablebinary
              enablegossip
              enablehandoff
 -            enablehintsfordc
              enablethrift
++            enablehintsfordc
+             failuredetector
+             gcstats
              getcompactionthroughput
++            getconcurrentcompactors
+             getinterdcstreamthroughput
              getlogginglevels
              getstreamthroughput
++            gettimeout
+             gettraceprobability
              gossipinfo
              help
              invalidatecountercache
@@@ -86,11 -95,17 +97,19 @@@
              resetlocalschema
              resumehandoff
              ring
++            setconcurrentcompactors
+             sethintedhandoffthrottlekb
+             setinterdcstreamthroughput
              setlogginglevel
++            settimeout
              status
+             statusbackup
              statusbinary
 +            statusthrift
+             statusgossip
+             statushandoff
 -            statusthrift
              stopdaemon
+             tablestats
              tpstats
              version
              '
@@@ -104,6 -119,6 +123,7 @@@
              disableautocompaction
              enableautocompaction
              flush
++            garbagecollect
              getcompactionthreshold
              getendpoints
              getsstables
@@@ -113,6 -128,6 +133,7 @@@
              rebuild
              rebuild_index
              refresh
++            relocatesstables
              removenode
              repair
              scrub
@@@ -124,27 -139,31 +145,35 @@@
              settraceprobability
              snapshot
              stop
-             taketoken
+             tablehistograms
+             toppartitions
              truncatehints
              upgradesstables
-             '
+             verify
++            viewbuildstatus
+ 	    '
  
          local optwks='
-             cfhistograms
              cleanup
              clearsnapshot
              compact
              describering
              flush
++            garbagecollect
              getcompactionthreshold
              getendpoints
              getsstables
              rebuild_index
              refresh
++            relocatesstables
              repair
              scrub
              setcompactionthreshold
              snapshot
+             tablehistograms
+             toppartitions
+             verify
++            viewbuildstatus
              '
  
          local optwcfs='
@@@ -153,9 -172,11 +182,13 @@@
              disableautocompaction
              enableautocompaction
              flush
++            garbagecollect
++            relocatesstables
              repair
              scrub
+             toppartitions
              upgradesstables
+             verify
              '
  
          if [[ $COMP_CWORD -eq 1 ]] ; then
@@@ -197,7 -218,7 +230,7 @@@
              fi
          elif [[ $COMP_CWORD -eq 3 ]] ; then
              case "${COMP_WORDS[1]}" in
-                 cfhistograms|cleanup|compact|flush|getcompactionthreshold|getendpoints|getsstables|rebuild_index|refresh|repair|scrub|setcompactionthreshold)
 -                cleanup|compact|flush|getcompactionthreshold|getendpoints|getsstables|rebuild_index|refresh|repair|scrub|setcompactionthreshold|tablehistograms|toppartitions|verify)
++                cleanup|compact|flush|garbagecollect|getcompactionthreshold|getendpoints|getsstables|rebuild_index|refresh|relocatesstables|repair|scrub|setcompactionthreshold|tablehistograms|toppartitions|verify)
                      show_cfs ${prev} ${cur}
                      return 0
                      ;;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org