[jira] [Updated] (CASSANDRA-15185) Update quilt patches for 4.0

2019-06-26 Thread Michael Shuler (JIRA)


 [ 
https://issues.apache.org/jira/browse/CASSANDRA-15185?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Shuler updated CASSANDRA-15185:
---
 Complexity: Normal
   Priority: High  (was: Normal)
Change Category: Quality Assurance
 Status: Open  (was: Triage Needed)

> Update quilt patches for 4.0
> 
>
> Key: CASSANDRA-15185
> URL: https://issues.apache.org/jira/browse/CASSANDRA-15185
> Project: Cassandra
>  Issue Type: Task
>  Components: Build, Packaging
>Reporter: Michael Shuler
>Assignee: Michael Shuler
>Priority: High
>
> {noformat}
> (trunk)mshuler@hana:~/git/cassandra$ dpkg-buildpackage -uc -us
> <...>
> dpkg-source: info: building cassandra in cassandra_4.0.dsc
>  debian/rules build
> QUILT_PATCHES=debian/patches \
> quilt --quiltrc /dev/null push -a || test $? = 2
> Applying patch cassandra_logdir_fix.diff
> patching file bin/cassandra
> Hunk #1 FAILED at 171.
> 1 out of 1 hunk FAILED -- rejects in file bin/cassandra
> patching file conf/cassandra-env.sh
> Patch cassandra_logdir_fix.diff does not apply (enforce with -f)
> make: *** [/usr/share/quilt/quilt.make:18: debian/stamp-patched] Error 1
> dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2
> {noformat}



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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



[jira] [Updated] (CASSANDRA-15185) Update quilt patches for 4.0

2019-06-26 Thread Michael Shuler (JIRA)


 [ 
https://issues.apache.org/jira/browse/CASSANDRA-15185?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Shuler updated CASSANDRA-15185:
---
Attachment: 0001-Update-log-directory-patch-for-4.0-deb-package.patch

> Update quilt patches for 4.0
> 
>
> Key: CASSANDRA-15185
> URL: https://issues.apache.org/jira/browse/CASSANDRA-15185
> Project: Cassandra
>  Issue Type: Task
>  Components: Build, Packaging
>Reporter: Michael Shuler
>Assignee: Michael Shuler
>Priority: High
> Attachments: 0001-Update-log-directory-patch-for-4.0-deb-package.patch
>
>
> {noformat}
> (trunk)mshuler@hana:~/git/cassandra$ dpkg-buildpackage -uc -us
> <...>
> dpkg-source: info: building cassandra in cassandra_4.0.dsc
>  debian/rules build
> QUILT_PATCHES=debian/patches \
> quilt --quiltrc /dev/null push -a || test $? = 2
> Applying patch cassandra_logdir_fix.diff
> patching file bin/cassandra
> Hunk #1 FAILED at 171.
> 1 out of 1 hunk FAILED -- rejects in file bin/cassandra
> patching file conf/cassandra-env.sh
> Patch cassandra_logdir_fix.diff does not apply (enforce with -f)
> make: *** [/usr/share/quilt/quilt.make:18: debian/stamp-patched] Error 1
> dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2
> {noformat}



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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



[jira] [Updated] (CASSANDRA-15185) Update quilt patches for 4.0

2019-06-26 Thread Michael Shuler (JIRA)


 [ 
https://issues.apache.org/jira/browse/CASSANDRA-15185?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Shuler updated CASSANDRA-15185:
---
Test and Documentation Plan: build deb package
 Status: Patch Available  (was: Open)

> Update quilt patches for 4.0
> 
>
> Key: CASSANDRA-15185
> URL: https://issues.apache.org/jira/browse/CASSANDRA-15185
> Project: Cassandra
>  Issue Type: Task
>  Components: Build, Packaging
>Reporter: Michael Shuler
>Assignee: Michael Shuler
>Priority: High
> Attachments: 0001-Update-log-directory-patch-for-4.0-deb-package.patch
>
>
> {noformat}
> (trunk)mshuler@hana:~/git/cassandra$ dpkg-buildpackage -uc -us
> <...>
> dpkg-source: info: building cassandra in cassandra_4.0.dsc
>  debian/rules build
> QUILT_PATCHES=debian/patches \
> quilt --quiltrc /dev/null push -a || test $? = 2
> Applying patch cassandra_logdir_fix.diff
> patching file bin/cassandra
> Hunk #1 FAILED at 171.
> 1 out of 1 hunk FAILED -- rejects in file bin/cassandra
> patching file conf/cassandra-env.sh
> Patch cassandra_logdir_fix.diff does not apply (enforce with -f)
> make: *** [/usr/share/quilt/quilt.make:18: debian/stamp-patched] Error 1
> dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2
> {noformat}



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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



[jira] [Updated] (CASSANDRA-15185) Update quilt patches for 4.0

2019-06-26 Thread Michael Shuler (JIRA)


 [ 
https://issues.apache.org/jira/browse/CASSANDRA-15185?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Shuler updated CASSANDRA-15185:
---
Status: Ready to Commit  (was: Review In Progress)

> Update quilt patches for 4.0
> 
>
> Key: CASSANDRA-15185
> URL: https://issues.apache.org/jira/browse/CASSANDRA-15185
> Project: Cassandra
>  Issue Type: Task
>  Components: Build, Packaging
>Reporter: Michael Shuler
>Assignee: Michael Shuler
>Priority: High
> Attachments: 0001-Update-log-directory-patch-for-4.0-deb-package.patch
>
>
> {noformat}
> (trunk)mshuler@hana:~/git/cassandra$ dpkg-buildpackage -uc -us
> <...>
> dpkg-source: info: building cassandra in cassandra_4.0.dsc
>  debian/rules build
> QUILT_PATCHES=debian/patches \
> quilt --quiltrc /dev/null push -a || test $? = 2
> Applying patch cassandra_logdir_fix.diff
> patching file bin/cassandra
> Hunk #1 FAILED at 171.
> 1 out of 1 hunk FAILED -- rejects in file bin/cassandra
> patching file conf/cassandra-env.sh
> Patch cassandra_logdir_fix.diff does not apply (enforce with -f)
> make: *** [/usr/share/quilt/quilt.make:18: debian/stamp-patched] Error 1
> dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2
> {noformat}



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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



[jira] [Updated] (CASSANDRA-15185) Update quilt patches for 4.0

2019-06-26 Thread Michael Shuler (JIRA)


 [ 
https://issues.apache.org/jira/browse/CASSANDRA-15185?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Shuler updated CASSANDRA-15185:
---
Reviewers: Jon Haddad
   Status: Review In Progress  (was: Patch Available)

(got a +1 on slack for the patch)

> Update quilt patches for 4.0
> 
>
> Key: CASSANDRA-15185
> URL: https://issues.apache.org/jira/browse/CASSANDRA-15185
> Project: Cassandra
>  Issue Type: Task
>  Components: Build, Packaging
>Reporter: Michael Shuler
>Assignee: Michael Shuler
>Priority: High
> Attachments: 0001-Update-log-directory-patch-for-4.0-deb-package.patch
>
>
> {noformat}
> (trunk)mshuler@hana:~/git/cassandra$ dpkg-buildpackage -uc -us
> <...>
> dpkg-source: info: building cassandra in cassandra_4.0.dsc
>  debian/rules build
> QUILT_PATCHES=debian/patches \
> quilt --quiltrc /dev/null push -a || test $? = 2
> Applying patch cassandra_logdir_fix.diff
> patching file bin/cassandra
> Hunk #1 FAILED at 171.
> 1 out of 1 hunk FAILED -- rejects in file bin/cassandra
> patching file conf/cassandra-env.sh
> Patch cassandra_logdir_fix.diff does not apply (enforce with -f)
> make: *** [/usr/share/quilt/quilt.make:18: debian/stamp-patched] Error 1
> dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2
> {noformat}



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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



[jira] [Updated] (CASSANDRA-15185) Update quilt patches for 4.0

2019-06-26 Thread Michael Shuler (JIRA)


 [ 
https://issues.apache.org/jira/browse/CASSANDRA-15185?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Shuler updated CASSANDRA-15185:
---
  Fix Version/s: 4.0
Source Control Link: 
https://github.com/apache/cassandra/commit/61b77ac2b01098776a1bea15a775701230028514
 Status: Resolved  (was: Ready to Commit)
 Resolution: Fixed

> Update quilt patches for 4.0
> 
>
> Key: CASSANDRA-15185
> URL: https://issues.apache.org/jira/browse/CASSANDRA-15185
> Project: Cassandra
>  Issue Type: Task
>  Components: Build, Packaging
>Reporter: Michael Shuler
>Assignee: Michael Shuler
>Priority: High
> Fix For: 4.0
>
> Attachments: 0001-Update-log-directory-patch-for-4.0-deb-package.patch
>
>
> {noformat}
> (trunk)mshuler@hana:~/git/cassandra$ dpkg-buildpackage -uc -us
> <...>
> dpkg-source: info: building cassandra in cassandra_4.0.dsc
>  debian/rules build
> QUILT_PATCHES=debian/patches \
> quilt --quiltrc /dev/null push -a || test $? = 2
> Applying patch cassandra_logdir_fix.diff
> patching file bin/cassandra
> Hunk #1 FAILED at 171.
> 1 out of 1 hunk FAILED -- rejects in file bin/cassandra
> patching file conf/cassandra-env.sh
> Patch cassandra_logdir_fix.diff does not apply (enforce with -f)
> make: *** [/usr/share/quilt/quilt.make:18: debian/stamp-patched] Error 1
> dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2
> {noformat}



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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



[jira] [Updated] (CASSANDRA-15185) Update quilt patches for 4.0, 3.11, 3.0

2019-06-27 Thread Michael Shuler (JIRA)


 [ 
https://issues.apache.org/jira/browse/CASSANDRA-15185?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Shuler updated CASSANDRA-15185:
---
Summary: Update quilt patches for 4.0, 3.11, 3.0  (was: Update quilt 
patches for 4.0)

> Update quilt patches for 4.0, 3.11, 3.0
> ---
>
> Key: CASSANDRA-15185
> URL: https://issues.apache.org/jira/browse/CASSANDRA-15185
> Project: Cassandra
>  Issue Type: Task
>  Components: Build, Packaging
>Reporter: Michael Shuler
>Assignee: Michael Shuler
>Priority: High
> Fix For: 4.0
>
> Attachments: 0001-Update-log-directory-patch-for-4.0-deb-package.patch
>
>
> {noformat}
> (trunk)mshuler@hana:~/git/cassandra$ dpkg-buildpackage -uc -us
> <...>
> dpkg-source: info: building cassandra in cassandra_4.0.dsc
>  debian/rules build
> QUILT_PATCHES=debian/patches \
> quilt --quiltrc /dev/null push -a || test $? = 2
> Applying patch cassandra_logdir_fix.diff
> patching file bin/cassandra
> Hunk #1 FAILED at 171.
> 1 out of 1 hunk FAILED -- rejects in file bin/cassandra
> patching file conf/cassandra-env.sh
> Patch cassandra_logdir_fix.diff does not apply (enforce with -f)
> make: *** [/usr/share/quilt/quilt.make:18: debian/stamp-patched] Error 1
> dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2
> {noformat}



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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



[jira] [Updated] (CASSANDRA-15185) Update quilt patches for 4.0, 3.11, 3.0

2019-06-27 Thread Michael Shuler (JIRA)


 [ 
https://issues.apache.org/jira/browse/CASSANDRA-15185?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Shuler updated CASSANDRA-15185:
---
Status: Open  (was: Resolved)

CASSANDRA-15090 was committed to 3.11 and 3.0 branches, as well, so we'll need 
to commit the same patch update and merge up. Sorry I missed that - thought 
this was just trunk yesterday.

> Update quilt patches for 4.0, 3.11, 3.0
> ---
>
> Key: CASSANDRA-15185
> URL: https://issues.apache.org/jira/browse/CASSANDRA-15185
> Project: Cassandra
>  Issue Type: Task
>  Components: Build, Packaging
>Reporter: Michael Shuler
>Assignee: Michael Shuler
>Priority: High
> Fix For: 4.0
>
> Attachments: 0001-Update-log-directory-patch-for-4.0-deb-package.patch
>
>
> {noformat}
> (trunk)mshuler@hana:~/git/cassandra$ dpkg-buildpackage -uc -us
> <...>
> dpkg-source: info: building cassandra in cassandra_4.0.dsc
>  debian/rules build
> QUILT_PATCHES=debian/patches \
> quilt --quiltrc /dev/null push -a || test $? = 2
> Applying patch cassandra_logdir_fix.diff
> patching file bin/cassandra
> Hunk #1 FAILED at 171.
> 1 out of 1 hunk FAILED -- rejects in file bin/cassandra
> patching file conf/cassandra-env.sh
> Patch cassandra_logdir_fix.diff does not apply (enforce with -f)
> make: *** [/usr/share/quilt/quilt.make:18: debian/stamp-patched] Error 1
> dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2
> {noformat}



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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



[jira] [Updated] (CASSANDRA-15185) Update quilt patches for 4.0, 3.11, 3.0

2019-06-27 Thread Michael Shuler (JIRA)


 [ 
https://issues.apache.org/jira/browse/CASSANDRA-15185?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Shuler updated CASSANDRA-15185:
---
Status: Review In Progress  (was: Patch Available)

> Update quilt patches for 4.0, 3.11, 3.0
> ---
>
> Key: CASSANDRA-15185
> URL: https://issues.apache.org/jira/browse/CASSANDRA-15185
> Project: Cassandra
>  Issue Type: Task
>  Components: Build, Packaging
>Reporter: Michael Shuler
>Assignee: Michael Shuler
>Priority: High
> Fix For: 4.0
>
> Attachments: 0001-Update-log-directory-patch-for-4.0-deb-package.patch
>
>
> {noformat}
> (trunk)mshuler@hana:~/git/cassandra$ dpkg-buildpackage -uc -us
> <...>
> dpkg-source: info: building cassandra in cassandra_4.0.dsc
>  debian/rules build
> QUILT_PATCHES=debian/patches \
> quilt --quiltrc /dev/null push -a || test $? = 2
> Applying patch cassandra_logdir_fix.diff
> patching file bin/cassandra
> Hunk #1 FAILED at 171.
> 1 out of 1 hunk FAILED -- rejects in file bin/cassandra
> patching file conf/cassandra-env.sh
> Patch cassandra_logdir_fix.diff does not apply (enforce with -f)
> make: *** [/usr/share/quilt/quilt.make:18: debian/stamp-patched] Error 1
> dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2
> {noformat}



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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



[jira] [Updated] (CASSANDRA-15185) Update quilt patches for 4.0, 3.11, 3.0

2019-06-27 Thread Michael Shuler (JIRA)


 [ 
https://issues.apache.org/jira/browse/CASSANDRA-15185?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Shuler updated CASSANDRA-15185:
---
Status: Patch Available  (was: In Progress)

> Update quilt patches for 4.0, 3.11, 3.0
> ---
>
> Key: CASSANDRA-15185
> URL: https://issues.apache.org/jira/browse/CASSANDRA-15185
> Project: Cassandra
>  Issue Type: Task
>  Components: Build, Packaging
>Reporter: Michael Shuler
>Assignee: Michael Shuler
>Priority: High
> Fix For: 4.0
>
> Attachments: 0001-Update-log-directory-patch-for-4.0-deb-package.patch
>
>
> {noformat}
> (trunk)mshuler@hana:~/git/cassandra$ dpkg-buildpackage -uc -us
> <...>
> dpkg-source: info: building cassandra in cassandra_4.0.dsc
>  debian/rules build
> QUILT_PATCHES=debian/patches \
> quilt --quiltrc /dev/null push -a || test $? = 2
> Applying patch cassandra_logdir_fix.diff
> patching file bin/cassandra
> Hunk #1 FAILED at 171.
> 1 out of 1 hunk FAILED -- rejects in file bin/cassandra
> patching file conf/cassandra-env.sh
> Patch cassandra_logdir_fix.diff does not apply (enforce with -f)
> make: *** [/usr/share/quilt/quilt.make:18: debian/stamp-patched] Error 1
> dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2
> {noformat}



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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



[jira] [Updated] (CASSANDRA-15185) Update quilt patches for 4.0, 3.11, 3.0

2019-06-27 Thread Michael Shuler (JIRA)


 [ 
https://issues.apache.org/jira/browse/CASSANDRA-15185?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Shuler updated CASSANDRA-15185:
---
Status: Ready to Commit  (was: Review In Progress)

> Update quilt patches for 4.0, 3.11, 3.0
> ---
>
> Key: CASSANDRA-15185
> URL: https://issues.apache.org/jira/browse/CASSANDRA-15185
> Project: Cassandra
>  Issue Type: Task
>  Components: Build, Packaging
>Reporter: Michael Shuler
>Assignee: Michael Shuler
>Priority: High
> Fix For: 4.0
>
> Attachments: 0001-Update-log-directory-patch-for-4.0-deb-package.patch
>
>
> {noformat}
> (trunk)mshuler@hana:~/git/cassandra$ dpkg-buildpackage -uc -us
> <...>
> dpkg-source: info: building cassandra in cassandra_4.0.dsc
>  debian/rules build
> QUILT_PATCHES=debian/patches \
> quilt --quiltrc /dev/null push -a || test $? = 2
> Applying patch cassandra_logdir_fix.diff
> patching file bin/cassandra
> Hunk #1 FAILED at 171.
> 1 out of 1 hunk FAILED -- rejects in file bin/cassandra
> patching file conf/cassandra-env.sh
> Patch cassandra_logdir_fix.diff does not apply (enforce with -f)
> make: *** [/usr/share/quilt/quilt.make:18: debian/stamp-patched] Error 1
> dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2
> {noformat}



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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



[jira] [Updated] (CASSANDRA-15185) Update quilt patches for 4.0, 3.11, 3.0

2019-06-27 Thread Michael Shuler (JIRA)


 [ 
https://issues.apache.org/jira/browse/CASSANDRA-15185?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Michael Shuler updated CASSANDRA-15185:
---
Status: Resolved  (was: Ready to Commit)
Resolution: Fixed

dpatch is used in 3.0/3.11, fixed those branches up and `-s ours` merge in 
trunk.
https://github.com/apache/cassandra/commit/dc23631ab17c2c0cc21b05732f905bb23cb67682

> Update quilt patches for 4.0, 3.11, 3.0
> ---
>
> Key: CASSANDRA-15185
> URL: https://issues.apache.org/jira/browse/CASSANDRA-15185
> Project: Cassandra
>  Issue Type: Task
>  Components: Build, Packaging
>Reporter: Michael Shuler
>Assignee: Michael Shuler
>Priority: High
> Fix For: 4.0
>
> Attachments: 0001-Update-log-directory-patch-for-4.0-deb-package.patch
>
>
> {noformat}
> (trunk)mshuler@hana:~/git/cassandra$ dpkg-buildpackage -uc -us
> <...>
> dpkg-source: info: building cassandra in cassandra_4.0.dsc
>  debian/rules build
> QUILT_PATCHES=debian/patches \
> quilt --quiltrc /dev/null push -a || test $? = 2
> Applying patch cassandra_logdir_fix.diff
> patching file bin/cassandra
> Hunk #1 FAILED at 171.
> 1 out of 1 hunk FAILED -- rejects in file bin/cassandra
> patching file conf/cassandra-env.sh
> Patch cassandra_logdir_fix.diff does not apply (enforce with -f)
> make: *** [/usr/share/quilt/quilt.make:18: debian/stamp-patched] Error 1
> dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2
> {noformat}



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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