[GitHub] cassandra pull request #88: added encoding param to non-debug printmsg funct...

2016-12-12 Thread sparkida
GitHub user sparkida opened a pull request:

https://github.com/apache/cassandra/pull/88

added encoding param to non-debug printmsg function

`cqlsh> copy test.image3d_impressions to STDOUT;`
Running this ^ without `--debug` produces:
`() got an unexpected keyword argument 'encoding'`

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/sparkida/cassandra import-export-fix

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/cassandra/pull/88.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #88


commit c0a57ee2afaf4781ebc87b77249ad32617c37e64
Author: Nick Riley 
Date:   2016-12-13T01:09:54Z

added encoding to non-debug printmsg




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


Re: Current Branch Merge Path - PLEASE READ!

2016-12-12 Thread Jay Zhuang

Thanks Jeff. And I assume that the new features should only go to 3.x.

What about the backport process? For example, CASSANDRA-12941 is asking 
for backport a fix, should that be accepted? I could argue that it's a 
bug fix for Materialized View instead of new feature.


Thanks,
Jay


On 12/11/16 4:09 AM, Jeff Jirsa wrote:

It depends on severity, but generally… If you find a bug in 3.0, you should 
work back to 2.1 to see if it exists in older versions. We don’t put minor 
fixes into 2.1 (or really 2.2 at this point) – 2.1 is critical fixes only, and 
2.2 is getting to that point as well.

If it’s a minor minor bug, fix it in 3.0 and generate patches for versions 
newer than that. If it’s a critical bug, go back to 2.1 and see if it exists 
there as well.



On 12/10/16, 6:03 PM, "Jay Zhuang"  wrote:


I'm new to the community, sorry if it’s obvious question. Are there any
general guidance on choosing which branch we should start with? For
example, if I find a bug in 3.0, should I try to reproduce it in the
lowest version (2.1) and work from there?

Thanks,
Jay

On 12/8/16 10:29 AM, Michael Shuler wrote:

The current branch merge path is, in full:

cassandra-2.1
 |
 cassandra-2.2
  |
  cassandra-3.0
   |
   cassandra-3.11
|
cassandra-3.X
 |
 trunk

Wherever you start, please follow through the complete path to trunk.

I reopened JIRAs #12768, #12817, and #12694 for skipping cassandra-3.11.
Owners of those tickets, please commit to the cassandra-3.11 branch and
merge up. There were too many conflicts for me to comfortably try to
resolve on a straight merge from 3.0.