You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@mahout.apache.org by Dmitriy Lyubimov <dl...@gmail.com> on 2014/06/13 20:05:10 UTC

master branch history and Git commits - please DO squash your working branches before merging in

Hi,

I would like to suggest to prohibit merges and intermediate commits in the
master branch. Please   --squash history from the working branch (as
defined in PR merge page)!

Not squashing working branch history  makes it difficult to (1) attribute
intermediate commits to a Mahout issue as not all intermediate commit
messages clearly state so; and (2) be able to correct history if needed,
with rollbacks.

(I do list working branch history in commit description; or, rather, git
does it automatically for me, but they are not commits in the master).

Bottom line, it is a mess (Pat, i am winking at you :)

* commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
| Author: pferrel <pa...@occamsmachete.com>
| Date:   Thu Jun 12 17:45:09 2014 -0700
|
|     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
apache/mahout#12
|
*   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
|\  Merge: fd7a0bf a8e09cd
| | Author: pferrel <pa...@occamsmachete.com>
| | Date:   Thu Jun 12 11:33:55 2014 -0700
| |
| |     Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
| |
| * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
| | Author: ssc <ss...@apache.org>
| | Date:   Thu Jun 12 19:03:19 2014 +0200
| |
| |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
apache/mahout#16
| |
* |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
|\ \  Merge: d319b32 b044a07
| |/  Author: pferrel <pa...@occamsmachete.com>
| |   Date:   Wed Jun 11 19:17:59 2014 -0700
| |
| |       Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
| |
| * commit b044a07797a8fef23d10f10126615c9b7db659bb
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Tue Jun 10 11:46:32 2014 -0700
| |
| |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
| |
| |     This closes apache/mahout#15
| |
| |     Squashed commit of the following:
| |
| |     commit 0407577bff365028ceef9798d5835f12a81bc941
| |     Author: Anand Avati <av...@redhat.com>
| |     Date:   Mon Jun 9 22:05:14 2014 -0700
| |
| |         MAHOUT-1529: spark-shell - cleanup sdc
| |
| |         Renaming @sc to @sdc has left open the shutdown part. Spark
| |         depends on 'implicit sc' to be set by the shell invoker.
| |
| |           mahout> Stopping spark context.
| |           <console>:29: error: not found: value sc
| |                         sc.stop()
| |                         ^
| |
| |         So override sparkCleanUp() and call @sdc.stop()
| |
| |         Signed-off-by: Anand Avati <av...@redhat.com>
| |
| * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Tue Jun 10 11:30:55 2014 -0700
| |
| |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
the loaded data
| |
| |     This closes apache/mahout#10
| |
| |     Squashed commit of the following:
| |
| |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Tue Jun 10 11:27:38 2014 -0700
| |
| |         + tests
| |
| |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
| |     Merge: 162c5ca 907781b
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Tue Jun 10 11:04:51 2014 -0700
| |
| |         Merge branch 'master' into MAHOUT-1572
| |
| |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Wed Jun 4 15:10:11 2014 -0700
| |
| |         initial fix (?)
| |
| * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Tue Jun 10 10:48:55 2014 -0700
| |
| |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
correctly
| |
| |     This closes apache/mahout#9
* commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
| Author: pferrel <pa...@occamsmachete.com>
| Date:   Thu Jun 12 17:45:09 2014 -0700
|
|     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
apache/mahout#12
|
*   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
|\  Merge: fd7a0bf a8e09cd
| | Author: pferrel <pa...@occamsmachete.com>
| | Date:   Thu Jun 12 11:33:55 2014 -0700
| |
| |     Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
| |
| * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
| | Author: ssc <ss...@apache.org>
| | Date:   Thu Jun 12 19:03:19 2014 +0200
| |
| |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
apache/mahout#16
| |
* |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
|\ \  Merge: d319b32 b044a07
| |/  Author: pferrel <pa...@occamsmachete.com>
| |   Date:   Wed Jun 11 19:17:59 2014 -0700
| |
| |       Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
| |
| * commit b044a07797a8fef23d10f10126615c9b7db659bb
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Tue Jun 10 11:46:32 2014 -0700
| |
| |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
| |
| |     This closes apache/mahout#15
| |
| |     Squashed commit of the following:
| |
| |     commit 0407577bff365028ceef9798d5835f12a81bc941
| |     Author: Anand Avati <av...@redhat.com>
| |     Date:   Mon Jun 9 22:05:14 2014 -0700
| |
| |         MAHOUT-1529: spark-shell - cleanup sdc
| |
| |         Renaming @sc to @sdc has left open the shutdown part. Spark
| |         depends on 'implicit sc' to be set by the shell invoker.
| |
| |           mahout> Stopping spark context.
| |           <console>:29: error: not found: value sc
| |                         sc.stop()
| |                         ^
| |
| |         So override sparkCleanUp() and call @sdc.stop()
| |
| |         Signed-off-by: Anand Avati <av...@redhat.com>
| |
| * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Tue Jun 10 11:30:55 2014 -0700
| |
| |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
the loaded data
| |
| |     This closes apache/mahout#10
| |
| |     Squashed commit of the following:
| |
| |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Tue Jun 10 11:27:38 2014 -0700
| |
| |         + tests
| |
| |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
| |     Merge: 162c5ca 907781b
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Tue Jun 10 11:04:51 2014 -0700
| |
| |         Merge branch 'master' into MAHOUT-1572
| |
| |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Wed Jun 4 15:10:11 2014 -0700
| |
| |         initial fix (?)
| |
| * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Tue Jun 10 10:48:55 2014 -0700
| |
| |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
correctly
| |
| |     This closes apache/mahout#9
| |
| |     Squashed commit of the following:
| |
| |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Tue Jun 10 10:46:17 2014 -0700
| |
| |         Adding test
| |
| |     commit ef271380e16192b55c31c7b219195d6982587206
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Wed Jun 4 14:43:24 2014 -0700
| |
| |         initial fix (?)
| |
| * commit 11046fb5273b559298111b201470d80cd6af43d9
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Mon Jun 9 12:17:00 2014 -0700
| |
| |     NOJIRA: switching AlS to mahout's random from scala random to
ensure deterministic test for the time being.
| |
* |   commit d319b325066620a82d079379564188912e8b0b92
|\ \  Merge: a12135b fcb436d
| |/  Author: pferrel <pa...@occamsmachete.com>
| |   Date:   Mon Jun 9 07:01:15 2014 -0700
| |
| |       Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
| |
| * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
| | Author: Ted Dunning <td...@apache.org>
| | Date:   Sun Jun 8 21:18:09 2014 -0700
| |
| |     MAHOUT-1577 - Restore visibility for getYtransposeY
| |
| * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
| | Author: Ted Dunning <td...@apache.org>
| | Date:   Sun Jun 8 20:57:37 2014 -0700
| |
| |     MAHOUT-1577 - Kill a few more warnings and turn off several (like
newline in format string, non-final method call in constructor)
| |
| * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
| | Author: Ted Dunning <td...@apache.org>
| | Date:   Sun Jun 8 18:24:48 2014 -0700
| |
| |     MAHOUT-1576 - Fix several low hanging warnings, the most important
have to do with over-ridable operations in a constructor
| |
* |   commit a12135b94002367046ef6edc977527d586026689
|\ \  Merge: cc9a70e 99fd9ba
| |/  Author: pferrel <pa...@occamsmachete.com>
| |   Date:   Sun Jun 8 08:25:36 2014 -0700
| |
| |       Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
| |
| * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
| | Author: Ted Dunning <td...@apache.org>
| | Date:   Sat Jun 7 15:09:10 2014 -0700
| |
| |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
| |
* | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
|/  Author: pferrel <pa...@occamsmachete.com>
|   Date:   Sat Jun 7 13:36:12 2014 -0700
|
|       added .DS_Store to gitignore for pushes from mac
|
* commit 63b765abb305cca6d726f54549a92018754a6348
* commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
| Author: pferrel <pa...@occamsmachete.com>
| Date:   Thu Jun 12 17:45:09 2014 -0700
|
|     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
apache/mahout#12
|
*   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
|\  Merge: fd7a0bf a8e09cd
| | Author: pferrel <pa...@occamsmachete.com>
| | Date:   Thu Jun 12 11:33:55 2014 -0700
| |
| |     Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
| |
| * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
| | Author: ssc <ss...@apache.org>
| | Date:   Thu Jun 12 19:03:19 2014 +0200
| |
| |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
apache/mahout#16
| |
* |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
|\ \  Merge: d319b32 b044a07
| |/  Author: pferrel <pa...@occamsmachete.com>
| |   Date:   Wed Jun 11 19:17:59 2014 -0700
| |
| |       Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
| |
| * commit b044a07797a8fef23d10f10126615c9b7db659bb
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Tue Jun 10 11:46:32 2014 -0700
| |
| |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
| |
| |     This closes apache/mahout#15
| |
| |     Squashed commit of the following:
| |
| |     commit 0407577bff365028ceef9798d5835f12a81bc941
| |     Author: Anand Avati <av...@redhat.com>
| |     Date:   Mon Jun 9 22:05:14 2014 -0700
| |
| |         MAHOUT-1529: spark-shell - cleanup sdc
| |
| |         Renaming @sc to @sdc has left open the shutdown part. Spark
| |         depends on 'implicit sc' to be set by the shell invoker.
| |
| |           mahout> Stopping spark context.
| |           <console>:29: error: not found: value sc
| |                         sc.stop()
| |                         ^
| |
| |         So override sparkCleanUp() and call @sdc.stop()
| |
| |         Signed-off-by: Anand Avati <av...@redhat.com>
| |
| * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Tue Jun 10 11:30:55 2014 -0700
| |
| |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
the loaded data
| |
| |     This closes apache/mahout#10
| |
| |     Squashed commit of the following:
| |
| |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Tue Jun 10 11:27:38 2014 -0700
| |
| |         + tests
| |
| |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
| |     Merge: 162c5ca 907781b
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Tue Jun 10 11:04:51 2014 -0700
| |
| |         Merge branch 'master' into MAHOUT-1572
| |
| |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Wed Jun 4 15:10:11 2014 -0700
| |
| |         initial fix (?)
| |
| * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Tue Jun 10 10:48:55 2014 -0700
| |
| |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
correctly
| |
| |     This closes apache/mahout#9
| |
| |     Squashed commit of the following:
| |
| |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Tue Jun 10 10:46:17 2014 -0700
| |
| |         Adding test
| |
| |     commit ef271380e16192b55c31c7b219195d6982587206
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Wed Jun 4 14:43:24 2014 -0700
| |
| |         initial fix (?)
| |
| * commit 11046fb5273b559298111b201470d80cd6af43d9
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Mon Jun 9 12:17:00 2014 -0700
| |
| |     NOJIRA: switching AlS to mahout's random from scala random to
ensure deterministic test for the time being.
| |
* |   commit d319b325066620a82d079379564188912e8b0b92
|\ \  Merge: a12135b fcb436d
| |/  Author: pferrel <pa...@occamsmachete.com>
| |   Date:   Mon Jun 9 07:01:15 2014 -0700
| |
| |       Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
| |
| * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
| | Author: Ted Dunning <td...@apache.org>
| | Date:   Sun Jun 8 21:18:09 2014 -0700
| |
| |     MAHOUT-1577 - Restore visibility for getYtransposeY
| |
| * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
| | Author: Ted Dunning <td...@apache.org>
| | Date:   Sun Jun 8 20:57:37 2014 -0700
| |
| |     MAHOUT-1577 - Kill a few more warnings and turn off several (like
newline in format string, non-final method call in constructor)
| |
| * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
| | Author: Ted Dunning <td...@apache.org>
| | Date:   Sun Jun 8 18:24:48 2014 -0700
| |
| |     MAHOUT-1576 - Fix several low hanging warnings, the most important
have to do with over-ridable operations in a constructor
| |
* |   commit a12135b94002367046ef6edc977527d586026689
|\ \  Merge: cc9a70e 99fd9ba
| |/  Author: pferrel <pa...@occamsmachete.com>
| |   Date:   Sun Jun 8 08:25:36 2014 -0700
| |
| |       Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
| |
| * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
| | Author: Ted Dunning <td...@apache.org>
| | Date:   Sat Jun 7 15:09:10 2014 -0700
| |
| |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
| |
* | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
|/  Author: pferrel <pa...@occamsmachete.com>
|   Date:   Sat Jun 7 13:36:12 2014 -0700
|
|       added .DS_Store to gitignore for pushes from mac
|
* commit 63b765abb305cca6d726f54549a92018754a6348
* commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
| Author: pferrel <pa...@occamsmachete.com>
| Date:   Thu Jun 12 17:45:09 2014 -0700
|
|     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
apache/mahout#12
|
*   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
|\  Merge: fd7a0bf a8e09cd
| | Author: pferrel <pa...@occamsmachete.com>
| | Date:   Thu Jun 12 11:33:55 2014 -0700
| |
| |     Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
| |
| * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
| | Author: ssc <ss...@apache.org>
| | Date:   Thu Jun 12 19:03:19 2014 +0200
| |
| |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
apache/mahout#16
| |
* |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
|\ \  Merge: d319b32 b044a07
| |/  Author: pferrel <pa...@occamsmachete.com>
| |   Date:   Wed Jun 11 19:17:59 2014 -0700
| |
| |       Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
| |
| * commit b044a07797a8fef23d10f10126615c9b7db659bb
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Tue Jun 10 11:46:32 2014 -0700
| |
| |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
| |
| |     This closes apache/mahout#15
| |
| |     Squashed commit of the following:
| |
| |     commit 0407577bff365028ceef9798d5835f12a81bc941
| |     Author: Anand Avati <av...@redhat.com>
| |     Date:   Mon Jun 9 22:05:14 2014 -0700
| |
| |         MAHOUT-1529: spark-shell - cleanup sdc
| |
| |         Renaming @sc to @sdc has left open the shutdown part. Spark
| |         depends on 'implicit sc' to be set by the shell invoker.
| |
| |           mahout> Stopping spark context.
| |           <console>:29: error: not found: value sc
| |                         sc.stop()
| |                         ^
| |
| |         So override sparkCleanUp() and call @sdc.stop()
| |
| |         Signed-off-by: Anand Avati <av...@redhat.com>
| |
| * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Tue Jun 10 11:30:55 2014 -0700
| |
| |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
the loaded data
| |
| |     This closes apache/mahout#10
| |
| |     Squashed commit of the following:
| |
| |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Tue Jun 10 11:27:38 2014 -0700
| |
| |         + tests
| |
| |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
| |     Merge: 162c5ca 907781b
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Tue Jun 10 11:04:51 2014 -0700
| |
| |         Merge branch 'master' into MAHOUT-1572
| |
| |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Wed Jun 4 15:10:11 2014 -0700
| |
| |         initial fix (?)
| |
| * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Tue Jun 10 10:48:55 2014 -0700
| |
| |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
correctly
| |
| |     This closes apache/mahout#9
| |
| |     Squashed commit of the following:
| |
| |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Tue Jun 10 10:46:17 2014 -0700
| |
| |         Adding test
| |
| |     commit ef271380e16192b55c31c7b219195d6982587206
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Wed Jun 4 14:43:24 2014 -0700
| |
| |         initial fix (?)
| |
| * commit 11046fb5273b559298111b201470d80cd6af43d9
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Mon Jun 9 12:17:00 2014 -0700
| |
| |     NOJIRA: switching AlS to mahout's random from scala random to
ensure deterministic test for the time being.
| |
* |   commit d319b325066620a82d079379564188912e8b0b92
|\ \  Merge: a12135b fcb436d
| |/  Author: pferrel <pa...@occamsmachete.com>
| |   Date:   Mon Jun 9 07:01:15 2014 -0700
| |
| |       Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
| |
| * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
| | Author: Ted Dunning <td...@apache.org>
| | Date:   Sun Jun 8 21:18:09 2014 -0700
| |
| |     MAHOUT-1577 - Restore visibility for getYtransposeY
| |
| * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
| | Author: Ted Dunning <td...@apache.org>
| | Date:   Sun Jun 8 20:57:37 2014 -0700
| |
| |     MAHOUT-1577 - Kill a few more warnings and turn off several (like
newline in format string, non-final method call in constructor)
| |
| * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
| | Author: Ted Dunning <td...@apache.org>
| | Date:   Sun Jun 8 18:24:48 2014 -0700
| |
| |     MAHOUT-1576 - Fix several low hanging warnings, the most important
have to do with over-ridable operations in a constructor
| |
* |   commit a12135b94002367046ef6edc977527d586026689
|\ \  Merge: cc9a70e 99fd9ba
| |/  Author: pferrel <pa...@occamsmachete.com>
| |   Date:   Sun Jun 8 08:25:36 2014 -0700
| |
| |       Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
| |
| * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
| | Author: Ted Dunning <td...@apache.org>
| | Date:   Sat Jun 7 15:09:10 2014 -0700
| |
| |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
| |
* | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
|/  Author: pferrel <pa...@occamsmachete.com>
|   Date:   Sat Jun 7 13:36:12 2014 -0700
|

Re: master branch history and Git commits - please DO squash your working branches before merging in

Posted by Pat Ferrel <pa...@gmail.com>.
First, I looked at my bash history and did indeed ‘git merge --squash mahout-1464’.

On my machine looking at the master branch the graph looks the same as github apache/master, only six commits from me.

There are something like 25 total commits by me on my github apache mahout-1464 branch. 19 of which do not show up in the commit log or in any squash text. They should be in one place or the other I would expect. 

Not sure what went wrong but I'll check my log history before any further pushes.

On Jun 13, 2014, at 1:05 PM, Dmitriy Lyubimov <dl...@gmail.com> wrote:

it is the same history that i printed, in chronological order and not
showing graph of it. No contradiction here whatsoever. Github is not shoing
the entire graph (try git log --graph --date-order to see true succession
graph structure. You want to see one single line of succession, not the
weaving patterns of multiple succession paths and merges).




On Fri, Jun 13, 2014 at 12:35 PM, Pat Ferrel <pa...@gmail.com> wrote:

> It doesn’t show all the commit messages by any means. Look
> https://github.com/apache/mahout/commits/master?page=1
> 
> It shows 6 commit messages, all but 2 are times when I merged master into
> my branch (never pushed those to the apache master so I bet these are
> exceptions to squash). One is the commit before pushing. So all of those
> seem ok.
> 
> The weird one is a change to .gitignore ???, which I have no explanation
> for.
> 
> You looking somewhere else?
> 
> On Jun 13, 2014, at 11:38 AM, Dmitriy Lyubimov <dl...@gmail.com> wrote:
> 
> the recipe seems ok but obviously something wrong did happen since we still
> see your history in master.
> 
> I'd suggest to check the history explicitly before pushing if unsure.
> 
> ASF hooks prevent repairing history (as in rewriting history), and for a
> good reason since one got to be even more accurate while doing that than
> during simple squash merge, so we cannot undo it now and i guess we'd have
> to do what we do a bit more reverently when it comes to pushing to master.
> 
> -d
> 
> 
> On Fri, Jun 13, 2014 at 11:30 AM, Pat Ferrel <pa...@gmail.com> wrote:
> 
>> I did a:
>> 
>> git checkout master
>> git merge --squash mahout-1464
>> 
>> did my build, tests, updated changelog then
>> 
>> git commit -a -m “yada yada close PR message"
>> git push apache master
>> 
>> something wrong there?
>> 
>> On Jun 13, 2014, at 11:05 AM, Dmitriy Lyubimov <dl...@gmail.com>
> wrote:
>> 
>> Hi,
>> 
>> I would like to suggest to prohibit merges and intermediate commits in
> the
>> master branch. Please   --squash history from the working branch (as
>> defined in PR merge page)!
>> 
>> Not squashing working branch history  makes it difficult to (1) attribute
>> intermediate commits to a Mahout issue as not all intermediate commit
>> messages clearly state so; and (2) be able to correct history if needed,
>> with rollbacks.
>> 
>> (I do list working branch history in commit description; or, rather, git
>> does it automatically for me, but they are not commits in the master).
>> 
>> Bottom line, it is a mess (Pat, i am winking at you :)
>> 
>> * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
>> | Author: pferrel <pa...@occamsmachete.com>
>> | Date:   Thu Jun 12 17:45:09 2014 -0700
>> |
>> |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
>> apache/mahout#12
>> |
>> *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
>> |\  Merge: fd7a0bf a8e09cd
>> | | Author: pferrel <pa...@occamsmachete.com>
>> | | Date:   Thu Jun 12 11:33:55 2014 -0700
>> | |
>> | |     Merge branch 'master' of
>> https://git-wip-us.apache.org/repos/asf/mahout
>> | |
>> | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
>> | | Author: ssc <ss...@apache.org>
>> | | Date:   Thu Jun 12 19:03:19 2014 +0200
>> | |
>> | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
>> apache/mahout#16
>> | |
>> * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
>> |\ \  Merge: d319b32 b044a07
>> | |/  Author: pferrel <pa...@occamsmachete.com>
>> | |   Date:   Wed Jun 11 19:17:59 2014 -0700
>> | |
>> | |       Merge branch 'master' of
>> https://git-wip-us.apache.org/repos/asf/mahout
>> | |
>> | * commit b044a07797a8fef23d10f10126615c9b7db659bb
>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> | | Date:   Tue Jun 10 11:46:32 2014 -0700
>> | |
>> | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
>> | |
>> | |     This closes apache/mahout#15
>> | |
>> | |     Squashed commit of the following:
>> | |
>> | |     commit 0407577bff365028ceef9798d5835f12a81bc941
>> | |     Author: Anand Avati <av...@redhat.com>
>> | |     Date:   Mon Jun 9 22:05:14 2014 -0700
>> | |
>> | |         MAHOUT-1529: spark-shell - cleanup sdc
>> | |
>> | |         Renaming @sc to @sdc has left open the shutdown part. Spark
>> | |         depends on 'implicit sc' to be set by the shell invoker.
>> | |
>> | |           mahout> Stopping spark context.
>> | |           <console>:29: error: not found: value sc
>> | |                         sc.stop()
>> | |                         ^
>> | |
>> | |         So override sparkCleanUp() and call @sdc.stop()
>> | |
>> | |         Signed-off-by: Anand Avati <av...@redhat.com>
>> | |
>> | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> | | Date:   Tue Jun 10 11:30:55 2014 -0700
>> | |
>> | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
>> the loaded data
>> | |
>> | |     This closes apache/mahout#10
>> | |
>> | |     Squashed commit of the following:
>> | |
>> | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> | |     Date:   Tue Jun 10 11:27:38 2014 -0700
>> | |
>> | |         + tests
>> | |
>> | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
>> | |     Merge: 162c5ca 907781b
>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> | |     Date:   Tue Jun 10 11:04:51 2014 -0700
>> | |
>> | |         Merge branch 'master' into MAHOUT-1572
>> | |
>> | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> | |     Date:   Wed Jun 4 15:10:11 2014 -0700
>> | |
>> | |         initial fix (?)
>> | |
>> | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> | | Date:   Tue Jun 10 10:48:55 2014 -0700
>> | |
>> | |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
>> correctly
>> | |
>> | |     This closes apache/mahout#9
>> * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
>> | Author: pferrel <pa...@occamsmachete.com>
>> | Date:   Thu Jun 12 17:45:09 2014 -0700
>> |
>> |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
>> apache/mahout#12
>> |
>> *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
>> |\  Merge: fd7a0bf a8e09cd
>> | | Author: pferrel <pa...@occamsmachete.com>
>> | | Date:   Thu Jun 12 11:33:55 2014 -0700
>> | |
>> | |     Merge branch 'master' of
>> https://git-wip-us.apache.org/repos/asf/mahout
>> | |
>> | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
>> | | Author: ssc <ss...@apache.org>
>> | | Date:   Thu Jun 12 19:03:19 2014 +0200
>> | |
>> | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
>> apache/mahout#16
>> | |
>> * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
>> |\ \  Merge: d319b32 b044a07
>> | |/  Author: pferrel <pa...@occamsmachete.com>
>> | |   Date:   Wed Jun 11 19:17:59 2014 -0700
>> | |
>> | |       Merge branch 'master' of
>> https://git-wip-us.apache.org/repos/asf/mahout
>> | |
>> | * commit b044a07797a8fef23d10f10126615c9b7db659bb
>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> | | Date:   Tue Jun 10 11:46:32 2014 -0700
>> | |
>> | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
>> | |
>> | |     This closes apache/mahout#15
>> | |
>> | |     Squashed commit of the following:
>> | |
>> | |     commit 0407577bff365028ceef9798d5835f12a81bc941
>> | |     Author: Anand Avati <av...@redhat.com>
>> | |     Date:   Mon Jun 9 22:05:14 2014 -0700
>> | |
>> | |         MAHOUT-1529: spark-shell - cleanup sdc
>> | |
>> | |         Renaming @sc to @sdc has left open the shutdown part. Spark
>> | |         depends on 'implicit sc' to be set by the shell invoker.
>> | |
>> | |           mahout> Stopping spark context.
>> | |           <console>:29: error: not found: value sc
>> | |                         sc.stop()
>> | |                         ^
>> | |
>> | |         So override sparkCleanUp() and call @sdc.stop()
>> | |
>> | |         Signed-off-by: Anand Avati <av...@redhat.com>
>> | |
>> | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> | | Date:   Tue Jun 10 11:30:55 2014 -0700
>> | |
>> | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
>> the loaded data
>> | |
>> | |     This closes apache/mahout#10
>> | |
>> | |     Squashed commit of the following:
>> | |
>> | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> | |     Date:   Tue Jun 10 11:27:38 2014 -0700
>> | |
>> | |         + tests
>> | |
>> | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
>> | |     Merge: 162c5ca 907781b
>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> | |     Date:   Tue Jun 10 11:04:51 2014 -0700
>> | |
>> | |         Merge branch 'master' into MAHOUT-1572
>> | |
>> | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> | |     Date:   Wed Jun 4 15:10:11 2014 -0700
>> | |
>> | |         initial fix (?)
>> | |
>> | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> | | Date:   Tue Jun 10 10:48:55 2014 -0700
>> | |
>> | |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
>> correctly
>> | |
>> | |     This closes apache/mahout#9
>> | |
>> | |     Squashed commit of the following:
>> | |
>> | |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> | |     Date:   Tue Jun 10 10:46:17 2014 -0700
>> | |
>> | |         Adding test
>> | |
>> | |     commit ef271380e16192b55c31c7b219195d6982587206
>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> | |     Date:   Wed Jun 4 14:43:24 2014 -0700
>> | |
>> | |         initial fix (?)
>> | |
>> | * commit 11046fb5273b559298111b201470d80cd6af43d9
>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> | | Date:   Mon Jun 9 12:17:00 2014 -0700
>> | |
>> | |     NOJIRA: switching AlS to mahout's random from scala random to
>> ensure deterministic test for the time being.
>> | |
>> * |   commit d319b325066620a82d079379564188912e8b0b92
>> |\ \  Merge: a12135b fcb436d
>> | |/  Author: pferrel <pa...@occamsmachete.com>
>> | |   Date:   Mon Jun 9 07:01:15 2014 -0700
>> | |
>> | |       Merge branch 'master' of
>> https://git-wip-us.apache.org/repos/asf/mahout
>> | |
>> | * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
>> | | Author: Ted Dunning <td...@apache.org>
>> | | Date:   Sun Jun 8 21:18:09 2014 -0700
>> | |
>> | |     MAHOUT-1577 - Restore visibility for getYtransposeY
>> | |
>> | * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
>> | | Author: Ted Dunning <td...@apache.org>
>> | | Date:   Sun Jun 8 20:57:37 2014 -0700
>> | |
>> | |     MAHOUT-1577 - Kill a few more warnings and turn off several (like
>> newline in format string, non-final method call in constructor)
>> | |
>> | * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
>> | | Author: Ted Dunning <td...@apache.org>
>> | | Date:   Sun Jun 8 18:24:48 2014 -0700
>> | |
>> | |     MAHOUT-1576 - Fix several low hanging warnings, the most
> important
>> have to do with over-ridable operations in a constructor
>> | |
>> * |   commit a12135b94002367046ef6edc977527d586026689
>> |\ \  Merge: cc9a70e 99fd9ba
>> | |/  Author: pferrel <pa...@occamsmachete.com>
>> | |   Date:   Sun Jun 8 08:25:36 2014 -0700
>> | |
>> | |       Merge branch 'master' of
>> https://git-wip-us.apache.org/repos/asf/mahout
>> | |
>> | * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
>> | | Author: Ted Dunning <td...@apache.org>
>> | | Date:   Sat Jun 7 15:09:10 2014 -0700
>> | |
>> | |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
>> | |
>> * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
>> |/  Author: pferrel <pa...@occamsmachete.com>
>> |   Date:   Sat Jun 7 13:36:12 2014 -0700
>> |
>> |       added .DS_Store to gitignore for pushes from mac
>> |
>> * commit 63b765abb305cca6d726f54549a92018754a6348
>> * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
>> | Author: pferrel <pa...@occamsmachete.com>
>> | Date:   Thu Jun 12 17:45:09 2014 -0700
>> |
>> |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
>> apache/mahout#12
>> |
>> *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
>> |\  Merge: fd7a0bf a8e09cd
>> | | Author: pferrel <pa...@occamsmachete.com>
>> | | Date:   Thu Jun 12 11:33:55 2014 -0700
>> | |
>> | |     Merge branch 'master' of
>> https://git-wip-us.apache.org/repos/asf/mahout
>> | |
>> | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
>> | | Author: ssc <ss...@apache.org>
>> | | Date:   Thu Jun 12 19:03:19 2014 +0200
>> | |
>> | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
>> apache/mahout#16
>> | |
>> * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
>> |\ \  Merge: d319b32 b044a07
>> | |/  Author: pferrel <pa...@occamsmachete.com>
>> | |   Date:   Wed Jun 11 19:17:59 2014 -0700
>> | |
>> | |       Merge branch 'master' of
>> https://git-wip-us.apache.org/repos/asf/mahout
>> | |
>> | * commit b044a07797a8fef23d10f10126615c9b7db659bb
>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> | | Date:   Tue Jun 10 11:46:32 2014 -0700
>> | |
>> | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
>> | |
>> | |     This closes apache/mahout#15
>> | |
>> | |     Squashed commit of the following:
>> | |
>> | |     commit 0407577bff365028ceef9798d5835f12a81bc941
>> | |     Author: Anand Avati <av...@redhat.com>
>> | |     Date:   Mon Jun 9 22:05:14 2014 -0700
>> | |
>> | |         MAHOUT-1529: spark-shell - cleanup sdc
>> | |
>> | |         Renaming @sc to @sdc has left open the shutdown part. Spark
>> | |         depends on 'implicit sc' to be set by the shell invoker.
>> | |
>> | |           mahout> Stopping spark context.
>> | |           <console>:29: error: not found: value sc
>> | |                         sc.stop()
>> | |                         ^
>> | |
>> | |         So override sparkCleanUp() and call @sdc.stop()
>> | |
>> | |         Signed-off-by: Anand Avati <av...@redhat.com>
>> | |
>> | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> | | Date:   Tue Jun 10 11:30:55 2014 -0700
>> | |
>> | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
>> the loaded data
>> | |
>> | |     This closes apache/mahout#10
>> | |
>> | |     Squashed commit of the following:
>> | |
>> | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> | |     Date:   Tue Jun 10 11:27:38 2014 -0700
>> | |
>> | |         + tests
>> | |
>> | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
>> | |     Merge: 162c5ca 907781b
>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> | |     Date:   Tue Jun 10 11:04:51 2014 -0700
>> | |
>> | |         Merge branch 'master' into MAHOUT-1572
>> | |
>> | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> | |     Date:   Wed Jun 4 15:10:11 2014 -0700
>> | |
>> | |         initial fix (?)
>> | |
>> | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> | | Date:   Tue Jun 10 10:48:55 2014 -0700
>> | |
>> | |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
>> correctly
>> | |
>> | |     This closes apache/mahout#9
>> | |
>> | |     Squashed commit of the following:
>> | |
>> | |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> | |     Date:   Tue Jun 10 10:46:17 2014 -0700
>> | |
>> | |         Adding test
>> | |
>> | |     commit ef271380e16192b55c31c7b219195d6982587206
>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> | |     Date:   Wed Jun 4 14:43:24 2014 -0700
>> | |
>> | |         initial fix (?)
>> | |
>> | * commit 11046fb5273b559298111b201470d80cd6af43d9
>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> | | Date:   Mon Jun 9 12:17:00 2014 -0700
>> | |
>> | |     NOJIRA: switching AlS to mahout's random from scala random to
>> ensure deterministic test for the time being.
>> | |
>> * |   commit d319b325066620a82d079379564188912e8b0b92
>> |\ \  Merge: a12135b fcb436d
>> | |/  Author: pferrel <pa...@occamsmachete.com>
>> | |   Date:   Mon Jun 9 07:01:15 2014 -0700
>> | |
>> | |       Merge branch 'master' of
>> https://git-wip-us.apache.org/repos/asf/mahout
>> | |
>> | * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
>> | | Author: Ted Dunning <td...@apache.org>
>> | | Date:   Sun Jun 8 21:18:09 2014 -0700
>> | |
>> | |     MAHOUT-1577 - Restore visibility for getYtransposeY
>> | |
>> | * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
>> | | Author: Ted Dunning <td...@apache.org>
>> | | Date:   Sun Jun 8 20:57:37 2014 -0700
>> | |
>> | |     MAHOUT-1577 - Kill a few more warnings and turn off several (like
>> newline in format string, non-final method call in constructor)
>> | |
>> | * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
>> | | Author: Ted Dunning <td...@apache.org>
>> | | Date:   Sun Jun 8 18:24:48 2014 -0700
>> | |
>> | |     MAHOUT-1576 - Fix several low hanging warnings, the most
> important
>> have to do with over-ridable operations in a constructor
>> | |
>> * |   commit a12135b94002367046ef6edc977527d586026689
>> |\ \  Merge: cc9a70e 99fd9ba
>> | |/  Author: pferrel <pa...@occamsmachete.com>
>> | |   Date:   Sun Jun 8 08:25:36 2014 -0700
>> | |
>> | |       Merge branch 'master' of
>> https://git-wip-us.apache.org/repos/asf/mahout
>> | |
>> | * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
>> | | Author: Ted Dunning <td...@apache.org>
>> | | Date:   Sat Jun 7 15:09:10 2014 -0700
>> | |
>> | |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
>> | |
>> * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
>> |/  Author: pferrel <pa...@occamsmachete.com>
>> |   Date:   Sat Jun 7 13:36:12 2014 -0700
>> |
>> |       added .DS_Store to gitignore for pushes from mac
>> |
>> * commit 63b765abb305cca6d726f54549a92018754a6348
>> * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
>> | Author: pferrel <pa...@occamsmachete.com>
>> | Date:   Thu Jun 12 17:45:09 2014 -0700
>> |
>> |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
>> apache/mahout#12
>> |
>> *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
>> |\  Merge: fd7a0bf a8e09cd
>> | | Author: pferrel <pa...@occamsmachete.com>
>> | | Date:   Thu Jun 12 11:33:55 2014 -0700
>> | |
>> | |     Merge branch 'master' of
>> https://git-wip-us.apache.org/repos/asf/mahout
>> | |
>> | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
>> | | Author: ssc <ss...@apache.org>
>> | | Date:   Thu Jun 12 19:03:19 2014 +0200
>> | |
>> | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
>> apache/mahout#16
>> | |
>> * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
>> |\ \  Merge: d319b32 b044a07
>> | |/  Author: pferrel <pa...@occamsmachete.com>
>> | |   Date:   Wed Jun 11 19:17:59 2014 -0700
>> | |
>> | |       Merge branch 'master' of
>> https://git-wip-us.apache.org/repos/asf/mahout
>> | |
>> | * commit b044a07797a8fef23d10f10126615c9b7db659bb
>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> | | Date:   Tue Jun 10 11:46:32 2014 -0700
>> | |
>> | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
>> | |
>> | |     This closes apache/mahout#15
>> | |
>> | |     Squashed commit of the following:
>> | |
>> | |     commit 0407577bff365028ceef9798d5835f12a81bc941
>> | |     Author: Anand Avati <av...@redhat.com>
>> | |     Date:   Mon Jun 9 22:05:14 2014 -0700
>> | |
>> | |         MAHOUT-1529: spark-shell - cleanup sdc
>> | |
>> | |         Renaming @sc to @sdc has left open the shutdown part. Spark
>> | |         depends on 'implicit sc' to be set by the shell invoker.
>> | |
>> | |           mahout> Stopping spark context.
>> | |           <console>:29: error: not found: value sc
>> | |                         sc.stop()
>> | |                         ^
>> | |
>> | |         So override sparkCleanUp() and call @sdc.stop()
>> | |
>> | |         Signed-off-by: Anand Avati <av...@redhat.com>
>> | |
>> | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> | | Date:   Tue Jun 10 11:30:55 2014 -0700
>> | |
>> | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
>> the loaded data
>> | |
>> | |     This closes apache/mahout#10
>> | |
>> | |     Squashed commit of the following:
>> | |
>> | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> | |     Date:   Tue Jun 10 11:27:38 2014 -0700
>> | |
>> | |         + tests
>> | |
>> | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
>> | |     Merge: 162c5ca 907781b
>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> | |     Date:   Tue Jun 10 11:04:51 2014 -0700
>> | |
>> | |         Merge branch 'master' into MAHOUT-1572
>> | |
>> | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> | |     Date:   Wed Jun 4 15:10:11 2014 -0700
>> | |
>> | |         initial fix (?)
>> | |
>> | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> | | Date:   Tue Jun 10 10:48:55 2014 -0700
>> | |
>> | |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
>> correctly
>> | |
>> | |     This closes apache/mahout#9
>> | |
>> | |     Squashed commit of the following:
>> | |
>> | |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> | |     Date:   Tue Jun 10 10:46:17 2014 -0700
>> | |
>> | |         Adding test
>> | |
>> | |     commit ef271380e16192b55c31c7b219195d6982587206
>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> | |     Date:   Wed Jun 4 14:43:24 2014 -0700
>> | |
>> | |         initial fix (?)
>> | |
>> | * commit 11046fb5273b559298111b201470d80cd6af43d9
>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> | | Date:   Mon Jun 9 12:17:00 2014 -0700
>> | |
>> | |     NOJIRA: switching AlS to mahout's random from scala random to
>> ensure deterministic test for the time being.
>> | |
>> * |   commit d319b325066620a82d079379564188912e8b0b92
>> |\ \  Merge: a12135b fcb436d
>> | |/  Author: pferrel <pa...@occamsmachete.com>
>> | |   Date:   Mon Jun 9 07:01:15 2014 -0700
>> | |
>> | |       Merge branch 'master' of
>> https://git-wip-us.apache.org/repos/asf/mahout
>> | |
>> | * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
>> | | Author: Ted Dunning <td...@apache.org>
>> | | Date:   Sun Jun 8 21:18:09 2014 -0700
>> | |
>> | |     MAHOUT-1577 - Restore visibility for getYtransposeY
>> | |
>> | * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
>> | | Author: Ted Dunning <td...@apache.org>
>> | | Date:   Sun Jun 8 20:57:37 2014 -0700
>> | |
>> | |     MAHOUT-1577 - Kill a few more warnings and turn off several (like
>> newline in format string, non-final method call in constructor)
>> | |
>> | * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
>> | | Author: Ted Dunning <td...@apache.org>
>> | | Date:   Sun Jun 8 18:24:48 2014 -0700
>> | |
>> | |     MAHOUT-1576 - Fix several low hanging warnings, the most
> important
>> have to do with over-ridable operations in a constructor
>> | |
>> * |   commit a12135b94002367046ef6edc977527d586026689
>> |\ \  Merge: cc9a70e 99fd9ba
>> | |/  Author: pferrel <pa...@occamsmachete.com>
>> | |   Date:   Sun Jun 8 08:25:36 2014 -0700
>> | |
>> | |       Merge branch 'master' of
>> https://git-wip-us.apache.org/repos/asf/mahout
>> | |
>> | * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
>> | | Author: Ted Dunning <td...@apache.org>
>> | | Date:   Sat Jun 7 15:09:10 2014 -0700
>> | |
>> | |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
>> | |
>> * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
>> |/  Author: pferrel <pa...@occamsmachete.com>
>> |   Date:   Sat Jun 7 13:36:12 2014 -0700
>> |
>> 
>> 
> 
>

Re: master branch history and Git commits - please DO squash your working branches before merging in

Posted by Pat Ferrel <pa...@gmail.com>.
Certainly could be my error. But I wish I knew what it was. All I can do is try again and check the log before any push.

On Jun 13, 2014, at 1:26 PM, Dmitriy Lyubimov <dl...@gmail.com> wrote:

sorry should read "add your branch again with a squash"

On Fri, Jun 13, 2014 at 1:24 PM, Dmitriy Lyubimov <dl...@gmail.com> wrote:

> if you try to reset master to last Sebastian commit before your last
> merge,
> 
> git reset --hard a8e09cd3aa1c9d6
> 
> and then print the graph again, you'd see that there were single path of
> succession before your last push that brought in all the merges on your
> other path of succession. How that happened on your local git, i of course
> can't reverse-engineer, but there gotta be a human error somewhere.
> 
> if i were to repair it, i'd do just that then do forceful push back and
> try to add your branch again with a merge. then there would be one clean
> "star"-marked commit on top of Sebastian's commit. But the infra doesn't
> let us, so now it has to stay as is.
> 
> it's ok i suppose, git is a bit tricky to get used to. As long as we
> realize what's happening.
> 
> -d
> 
> 
> 
> 
> On Fri, Jun 13, 2014 at 1:05 PM, Dmitriy Lyubimov <dl...@gmail.com>
> wrote:
> 
>> it is the same history that i printed, in chronological order and not
>> showing graph of it. No contradiction here whatsoever. Github is not shoing
>> the entire graph (try git log --graph --date-order to see true succession
>> graph structure. You want to see one single line of succession, not the
>> weaving patterns of multiple succession paths and merges).
>> 
>> 
>> 
>> 
>> On Fri, Jun 13, 2014 at 12:35 PM, Pat Ferrel <pa...@gmail.com>
>> wrote:
>> 
>>> It doesn’t show all the commit messages by any means. Look
>>> https://github.com/apache/mahout/commits/master?page=1
>>> 
>>> It shows 6 commit messages, all but 2 are times when I merged master
>>> into my branch (never pushed those to the apache master so I bet these are
>>> exceptions to squash). One is the commit before pushing. So all of those
>>> seem ok.
>>> 
>>> The weird one is a change to .gitignore ???, which I have no explanation
>>> for.
>>> 
>>> You looking somewhere else?
>>> 
>>> On Jun 13, 2014, at 11:38 AM, Dmitriy Lyubimov <dl...@gmail.com>
>>> wrote:
>>> 
>>> the recipe seems ok but obviously something wrong did happen since we
>>> still
>>> see your history in master.
>>> 
>>> I'd suggest to check the history explicitly before pushing if unsure.
>>> 
>>> ASF hooks prevent repairing history (as in rewriting history), and for a
>>> good reason since one got to be even more accurate while doing that than
>>> during simple squash merge, so we cannot undo it now and i guess we'd
>>> have
>>> to do what we do a bit more reverently when it comes to pushing to
>>> master.
>>> 
>>> -d
>>> 
>>> 
>>> On Fri, Jun 13, 2014 at 11:30 AM, Pat Ferrel <pa...@gmail.com>
>>> wrote:
>>> 
>>>> I did a:
>>>> 
>>>> git checkout master
>>>> git merge --squash mahout-1464
>>>> 
>>>> did my build, tests, updated changelog then
>>>> 
>>>> git commit -a -m “yada yada close PR message"
>>>> git push apache master
>>>> 
>>>> something wrong there?
>>>> 
>>>> On Jun 13, 2014, at 11:05 AM, Dmitriy Lyubimov <dl...@gmail.com>
>>> wrote:
>>>> 
>>>> Hi,
>>>> 
>>>> I would like to suggest to prohibit merges and intermediate commits in
>>> the
>>>> master branch. Please   --squash history from the working branch (as
>>>> defined in PR merge page)!
>>>> 
>>>> Not squashing working branch history  makes it difficult to (1)
>>> attribute
>>>> intermediate commits to a Mahout issue as not all intermediate commit
>>>> messages clearly state so; and (2) be able to correct history if
>>> needed,
>>>> with rollbacks.
>>>> 
>>>> (I do list working branch history in commit description; or, rather,
>>> git
>>>> does it automatically for me, but they are not commits in the master).
>>>> 
>>>> Bottom line, it is a mess (Pat, i am winking at you :)
>>>> 
>>>> * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
>>>> | Author: pferrel <pa...@occamsmachete.com>
>>>> | Date:   Thu Jun 12 17:45:09 2014 -0700
>>>> |
>>>> |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
>>>> apache/mahout#12
>>>> |
>>>> *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
>>>> |\  Merge: fd7a0bf a8e09cd
>>>> | | Author: pferrel <pa...@occamsmachete.com>
>>>> | | Date:   Thu Jun 12 11:33:55 2014 -0700
>>>> | |
>>>> | |     Merge branch 'master' of
>>>> https://git-wip-us.apache.org/repos/asf/mahout
>>>> | |
>>>> | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
>>>> | | Author: ssc <ss...@apache.org>
>>>> | | Date:   Thu Jun 12 19:03:19 2014 +0200
>>>> | |
>>>> | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
>>>> apache/mahout#16
>>>> | |
>>>> * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
>>>> |\ \  Merge: d319b32 b044a07
>>>> | |/  Author: pferrel <pa...@occamsmachete.com>
>>>> | |   Date:   Wed Jun 11 19:17:59 2014 -0700
>>>> | |
>>>> | |       Merge branch 'master' of
>>>> https://git-wip-us.apache.org/repos/asf/mahout
>>>> | |
>>>> | * commit b044a07797a8fef23d10f10126615c9b7db659bb
>>>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | | Date:   Tue Jun 10 11:46:32 2014 -0700
>>>> | |
>>>> | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
>>>> | |
>>>> | |     This closes apache/mahout#15
>>>> | |
>>>> | |     Squashed commit of the following:
>>>> | |
>>>> | |     commit 0407577bff365028ceef9798d5835f12a81bc941
>>>> | |     Author: Anand Avati <av...@redhat.com>
>>>> | |     Date:   Mon Jun 9 22:05:14 2014 -0700
>>>> | |
>>>> | |         MAHOUT-1529: spark-shell - cleanup sdc
>>>> | |
>>>> | |         Renaming @sc to @sdc has left open the shutdown part. Spark
>>>> | |         depends on 'implicit sc' to be set by the shell invoker.
>>>> | |
>>>> | |           mahout> Stopping spark context.
>>>> | |           <console>:29: error: not found: value sc
>>>> | |                         sc.stop()
>>>> | |                         ^
>>>> | |
>>>> | |         So override sparkCleanUp() and call @sdc.stop()
>>>> | |
>>>> | |         Signed-off-by: Anand Avati <av...@redhat.com>
>>>> | |
>>>> | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
>>>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | | Date:   Tue Jun 10 11:30:55 2014 -0700
>>>> | |
>>>> | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity
>>> in
>>>> the loaded data
>>>> | |
>>>> | |     This closes apache/mahout#10
>>>> | |
>>>> | |     Squashed commit of the following:
>>>> | |
>>>> | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
>>>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | |     Date:   Tue Jun 10 11:27:38 2014 -0700
>>>> | |
>>>> | |         + tests
>>>> | |
>>>> | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
>>>> | |     Merge: 162c5ca 907781b
>>>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | |     Date:   Tue Jun 10 11:04:51 2014 -0700
>>>> | |
>>>> | |         Merge branch 'master' into MAHOUT-1572
>>>> | |
>>>> | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
>>>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | |     Date:   Wed Jun 4 15:10:11 2014 -0700
>>>> | |
>>>> | |         initial fix (?)
>>>> | |
>>>> | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
>>>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | | Date:   Tue Jun 10 10:48:55 2014 -0700
>>>> | |
>>>> | |     MAHOUT-1571: Functional Views are not serialized as
>>> dense/sparse
>>>> correctly
>>>> | |
>>>> | |     This closes apache/mahout#9
>>>> * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
>>>> | Author: pferrel <pa...@occamsmachete.com>
>>>> | Date:   Thu Jun 12 17:45:09 2014 -0700
>>>> |
>>>> |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
>>>> apache/mahout#12
>>>> |
>>>> *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
>>>> |\  Merge: fd7a0bf a8e09cd
>>>> | | Author: pferrel <pa...@occamsmachete.com>
>>>> | | Date:   Thu Jun 12 11:33:55 2014 -0700
>>>> | |
>>>> | |     Merge branch 'master' of
>>>> https://git-wip-us.apache.org/repos/asf/mahout
>>>> | |
>>>> | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
>>>> | | Author: ssc <ss...@apache.org>
>>>> | | Date:   Thu Jun 12 19:03:19 2014 +0200
>>>> | |
>>>> | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
>>>> apache/mahout#16
>>>> | |
>>>> * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
>>>> |\ \  Merge: d319b32 b044a07
>>>> | |/  Author: pferrel <pa...@occamsmachete.com>
>>>> | |   Date:   Wed Jun 11 19:17:59 2014 -0700
>>>> | |
>>>> | |       Merge branch 'master' of
>>>> https://git-wip-us.apache.org/repos/asf/mahout
>>>> | |
>>>> | * commit b044a07797a8fef23d10f10126615c9b7db659bb
>>>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | | Date:   Tue Jun 10 11:46:32 2014 -0700
>>>> | |
>>>> | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
>>>> | |
>>>> | |     This closes apache/mahout#15
>>>> | |
>>>> | |     Squashed commit of the following:
>>>> | |
>>>> | |     commit 0407577bff365028ceef9798d5835f12a81bc941
>>>> | |     Author: Anand Avati <av...@redhat.com>
>>>> | |     Date:   Mon Jun 9 22:05:14 2014 -0700
>>>> | |
>>>> | |         MAHOUT-1529: spark-shell - cleanup sdc
>>>> | |
>>>> | |         Renaming @sc to @sdc has left open the shutdown part. Spark
>>>> | |         depends on 'implicit sc' to be set by the shell invoker.
>>>> | |
>>>> | |           mahout> Stopping spark context.
>>>> | |           <console>:29: error: not found: value sc
>>>> | |                         sc.stop()
>>>> | |                         ^
>>>> | |
>>>> | |         So override sparkCleanUp() and call @sdc.stop()
>>>> | |
>>>> | |         Signed-off-by: Anand Avati <av...@redhat.com>
>>>> | |
>>>> | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
>>>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | | Date:   Tue Jun 10 11:30:55 2014 -0700
>>>> | |
>>>> | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity
>>> in
>>>> the loaded data
>>>> | |
>>>> | |     This closes apache/mahout#10
>>>> | |
>>>> | |     Squashed commit of the following:
>>>> | |
>>>> | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
>>>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | |     Date:   Tue Jun 10 11:27:38 2014 -0700
>>>> | |
>>>> | |         + tests
>>>> | |
>>>> | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
>>>> | |     Merge: 162c5ca 907781b
>>>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | |     Date:   Tue Jun 10 11:04:51 2014 -0700
>>>> | |
>>>> | |         Merge branch 'master' into MAHOUT-1572
>>>> | |
>>>> | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
>>>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | |     Date:   Wed Jun 4 15:10:11 2014 -0700
>>>> | |
>>>> | |         initial fix (?)
>>>> | |
>>>> | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
>>>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | | Date:   Tue Jun 10 10:48:55 2014 -0700
>>>> | |
>>>> | |     MAHOUT-1571: Functional Views are not serialized as
>>> dense/sparse
>>>> correctly
>>>> | |
>>>> | |     This closes apache/mahout#9
>>>> | |
>>>> | |     Squashed commit of the following:
>>>> | |
>>>> | |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
>>>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | |     Date:   Tue Jun 10 10:46:17 2014 -0700
>>>> | |
>>>> | |         Adding test
>>>> | |
>>>> | |     commit ef271380e16192b55c31c7b219195d6982587206
>>>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | |     Date:   Wed Jun 4 14:43:24 2014 -0700
>>>> | |
>>>> | |         initial fix (?)
>>>> | |
>>>> | * commit 11046fb5273b559298111b201470d80cd6af43d9
>>>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | | Date:   Mon Jun 9 12:17:00 2014 -0700
>>>> | |
>>>> | |     NOJIRA: switching AlS to mahout's random from scala random to
>>>> ensure deterministic test for the time being.
>>>> | |
>>>> * |   commit d319b325066620a82d079379564188912e8b0b92
>>>> |\ \  Merge: a12135b fcb436d
>>>> | |/  Author: pferrel <pa...@occamsmachete.com>
>>>> | |   Date:   Mon Jun 9 07:01:15 2014 -0700
>>>> | |
>>>> | |       Merge branch 'master' of
>>>> https://git-wip-us.apache.org/repos/asf/mahout
>>>> | |
>>>> | * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
>>>> | | Author: Ted Dunning <td...@apache.org>
>>>> | | Date:   Sun Jun 8 21:18:09 2014 -0700
>>>> | |
>>>> | |     MAHOUT-1577 - Restore visibility for getYtransposeY
>>>> | |
>>>> | * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
>>>> | | Author: Ted Dunning <td...@apache.org>
>>>> | | Date:   Sun Jun 8 20:57:37 2014 -0700
>>>> | |
>>>> | |     MAHOUT-1577 - Kill a few more warnings and turn off several
>>> (like
>>>> newline in format string, non-final method call in constructor)
>>>> | |
>>>> | * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
>>>> | | Author: Ted Dunning <td...@apache.org>
>>>> | | Date:   Sun Jun 8 18:24:48 2014 -0700
>>>> | |
>>>> | |     MAHOUT-1576 - Fix several low hanging warnings, the most
>>> important
>>>> have to do with over-ridable operations in a constructor
>>>> | |
>>>> * |   commit a12135b94002367046ef6edc977527d586026689
>>>> |\ \  Merge: cc9a70e 99fd9ba
>>>> | |/  Author: pferrel <pa...@occamsmachete.com>
>>>> | |   Date:   Sun Jun 8 08:25:36 2014 -0700
>>>> | |
>>>> | |       Merge branch 'master' of
>>>> https://git-wip-us.apache.org/repos/asf/mahout
>>>> | |
>>>> | * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
>>>> | | Author: Ted Dunning <td...@apache.org>
>>>> | | Date:   Sat Jun 7 15:09:10 2014 -0700
>>>> | |
>>>> | |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
>>>> | |
>>>> * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
>>>> |/  Author: pferrel <pa...@occamsmachete.com>
>>>> |   Date:   Sat Jun 7 13:36:12 2014 -0700
>>>> |
>>>> |       added .DS_Store to gitignore for pushes from mac
>>>> |
>>>> * commit 63b765abb305cca6d726f54549a92018754a6348
>>>> * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
>>>> | Author: pferrel <pa...@occamsmachete.com>
>>>> | Date:   Thu Jun 12 17:45:09 2014 -0700
>>>> |
>>>> |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
>>>> apache/mahout#12
>>>> |
>>>> *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
>>>> |\  Merge: fd7a0bf a8e09cd
>>>> | | Author: pferrel <pa...@occamsmachete.com>
>>>> | | Date:   Thu Jun 12 11:33:55 2014 -0700
>>>> | |
>>>> | |     Merge branch 'master' of
>>>> https://git-wip-us.apache.org/repos/asf/mahout
>>>> | |
>>>> | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
>>>> | | Author: ssc <ss...@apache.org>
>>>> | | Date:   Thu Jun 12 19:03:19 2014 +0200
>>>> | |
>>>> | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
>>>> apache/mahout#16
>>>> | |
>>>> * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
>>>> |\ \  Merge: d319b32 b044a07
>>>> | |/  Author: pferrel <pa...@occamsmachete.com>
>>>> | |   Date:   Wed Jun 11 19:17:59 2014 -0700
>>>> | |
>>>> | |       Merge branch 'master' of
>>>> https://git-wip-us.apache.org/repos/asf/mahout
>>>> | |
>>>> | * commit b044a07797a8fef23d10f10126615c9b7db659bb
>>>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | | Date:   Tue Jun 10 11:46:32 2014 -0700
>>>> | |
>>>> | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
>>>> | |
>>>> | |     This closes apache/mahout#15
>>>> | |
>>>> | |     Squashed commit of the following:
>>>> | |
>>>> | |     commit 0407577bff365028ceef9798d5835f12a81bc941
>>>> | |     Author: Anand Avati <av...@redhat.com>
>>>> | |     Date:   Mon Jun 9 22:05:14 2014 -0700
>>>> | |
>>>> | |         MAHOUT-1529: spark-shell - cleanup sdc
>>>> | |
>>>> | |         Renaming @sc to @sdc has left open the shutdown part. Spark
>>>> | |         depends on 'implicit sc' to be set by the shell invoker.
>>>> | |
>>>> | |           mahout> Stopping spark context.
>>>> | |           <console>:29: error: not found: value sc
>>>> | |                         sc.stop()
>>>> | |                         ^
>>>> | |
>>>> | |         So override sparkCleanUp() and call @sdc.stop()
>>>> | |
>>>> | |         Signed-off-by: Anand Avati <av...@redhat.com>
>>>> | |
>>>> | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
>>>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | | Date:   Tue Jun 10 11:30:55 2014 -0700
>>>> | |
>>>> | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity
>>> in
>>>> the loaded data
>>>> | |
>>>> | |     This closes apache/mahout#10
>>>> | |
>>>> | |     Squashed commit of the following:
>>>> | |
>>>> | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
>>>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | |     Date:   Tue Jun 10 11:27:38 2014 -0700
>>>> | |
>>>> | |         + tests
>>>> | |
>>>> | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
>>>> | |     Merge: 162c5ca 907781b
>>>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | |     Date:   Tue Jun 10 11:04:51 2014 -0700
>>>> | |
>>>> | |         Merge branch 'master' into MAHOUT-1572
>>>> | |
>>>> | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
>>>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | |     Date:   Wed Jun 4 15:10:11 2014 -0700
>>>> | |
>>>> | |         initial fix (?)
>>>> | |
>>>> | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
>>>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | | Date:   Tue Jun 10 10:48:55 2014 -0700
>>>> | |
>>>> | |     MAHOUT-1571: Functional Views are not serialized as
>>> dense/sparse
>>>> correctly
>>>> | |
>>>> | |     This closes apache/mahout#9
>>>> | |
>>>> | |     Squashed commit of the following:
>>>> | |
>>>> | |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
>>>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | |     Date:   Tue Jun 10 10:46:17 2014 -0700
>>>> | |
>>>> | |         Adding test
>>>> | |
>>>> | |     commit ef271380e16192b55c31c7b219195d6982587206
>>>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | |     Date:   Wed Jun 4 14:43:24 2014 -0700
>>>> | |
>>>> | |         initial fix (?)
>>>> | |
>>>> | * commit 11046fb5273b559298111b201470d80cd6af43d9
>>>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | | Date:   Mon Jun 9 12:17:00 2014 -0700
>>>> | |
>>>> | |     NOJIRA: switching AlS to mahout's random from scala random to
>>>> ensure deterministic test for the time being.
>>>> | |
>>>> * |   commit d319b325066620a82d079379564188912e8b0b92
>>>> |\ \  Merge: a12135b fcb436d
>>>> | |/  Author: pferrel <pa...@occamsmachete.com>
>>>> | |   Date:   Mon Jun 9 07:01:15 2014 -0700
>>>> | |
>>>> | |       Merge branch 'master' of
>>>> https://git-wip-us.apache.org/repos/asf/mahout
>>>> | |
>>>> | * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
>>>> | | Author: Ted Dunning <td...@apache.org>
>>>> | | Date:   Sun Jun 8 21:18:09 2014 -0700
>>>> | |
>>>> | |     MAHOUT-1577 - Restore visibility for getYtransposeY
>>>> | |
>>>> | * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
>>>> | | Author: Ted Dunning <td...@apache.org>
>>>> | | Date:   Sun Jun 8 20:57:37 2014 -0700
>>>> | |
>>>> | |     MAHOUT-1577 - Kill a few more warnings and turn off several
>>> (like
>>>> newline in format string, non-final method call in constructor)
>>>> | |
>>>> | * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
>>>> | | Author: Ted Dunning <td...@apache.org>
>>>> | | Date:   Sun Jun 8 18:24:48 2014 -0700
>>>> | |
>>>> | |     MAHOUT-1576 - Fix several low hanging warnings, the most
>>> important
>>>> have to do with over-ridable operations in a constructor
>>>> | |
>>>> * |   commit a12135b94002367046ef6edc977527d586026689
>>>> |\ \  Merge: cc9a70e 99fd9ba
>>>> | |/  Author: pferrel <pa...@occamsmachete.com>
>>>> | |   Date:   Sun Jun 8 08:25:36 2014 -0700
>>>> | |
>>>> | |       Merge branch 'master' of
>>>> https://git-wip-us.apache.org/repos/asf/mahout
>>>> | |
>>>> | * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
>>>> | | Author: Ted Dunning <td...@apache.org>
>>>> | | Date:   Sat Jun 7 15:09:10 2014 -0700
>>>> | |
>>>> | |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
>>>> | |
>>>> * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
>>>> |/  Author: pferrel <pa...@occamsmachete.com>
>>>> |   Date:   Sat Jun 7 13:36:12 2014 -0700
>>>> |
>>>> |       added .DS_Store to gitignore for pushes from mac
>>>> |
>>>> * commit 63b765abb305cca6d726f54549a92018754a6348
>>>> * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
>>>> | Author: pferrel <pa...@occamsmachete.com>
>>>> | Date:   Thu Jun 12 17:45:09 2014 -0700
>>>> |
>>>> |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
>>>> apache/mahout#12
>>>> |
>>>> *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
>>>> |\  Merge: fd7a0bf a8e09cd
>>>> | | Author: pferrel <pa...@occamsmachete.com>
>>>> | | Date:   Thu Jun 12 11:33:55 2014 -0700
>>>> | |
>>>> | |     Merge branch 'master' of
>>>> https://git-wip-us.apache.org/repos/asf/mahout
>>>> | |
>>>> | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
>>>> | | Author: ssc <ss...@apache.org>
>>>> | | Date:   Thu Jun 12 19:03:19 2014 +0200
>>>> | |
>>>> | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
>>>> apache/mahout#16
>>>> | |
>>>> * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
>>>> |\ \  Merge: d319b32 b044a07
>>>> | |/  Author: pferrel <pa...@occamsmachete.com>
>>>> | |   Date:   Wed Jun 11 19:17:59 2014 -0700
>>>> | |
>>>> | |       Merge branch 'master' of
>>>> https://git-wip-us.apache.org/repos/asf/mahout
>>>> | |
>>>> | * commit b044a07797a8fef23d10f10126615c9b7db659bb
>>>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | | Date:   Tue Jun 10 11:46:32 2014 -0700
>>>> | |
>>>> | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
>>>> | |
>>>> | |     This closes apache/mahout#15
>>>> | |
>>>> | |     Squashed commit of the following:
>>>> | |
>>>> | |     commit 0407577bff365028ceef9798d5835f12a81bc941
>>>> | |     Author: Anand Avati <av...@redhat.com>
>>>> | |     Date:   Mon Jun 9 22:05:14 2014 -0700
>>>> | |
>>>> | |         MAHOUT-1529: spark-shell - cleanup sdc
>>>> | |
>>>> | |         Renaming @sc to @sdc has left open the shutdown part. Spark
>>>> | |         depends on 'implicit sc' to be set by the shell invoker.
>>>> | |
>>>> | |           mahout> Stopping spark context.
>>>> | |           <console>:29: error: not found: value sc
>>>> | |                         sc.stop()
>>>> | |                         ^
>>>> | |
>>>> | |         So override sparkCleanUp() and call @sdc.stop()
>>>> | |
>>>> | |         Signed-off-by: Anand Avati <av...@redhat.com>
>>>> | |
>>>> | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
>>>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | | Date:   Tue Jun 10 11:30:55 2014 -0700
>>>> | |
>>>> | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity
>>> in
>>>> the loaded data
>>>> | |
>>>> | |     This closes apache/mahout#10
>>>> | |
>>>> | |     Squashed commit of the following:
>>>> | |
>>>> | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
>>>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | |     Date:   Tue Jun 10 11:27:38 2014 -0700
>>>> | |
>>>> | |         + tests
>>>> | |
>>>> | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
>>>> | |     Merge: 162c5ca 907781b
>>>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | |     Date:   Tue Jun 10 11:04:51 2014 -0700
>>>> | |
>>>> | |         Merge branch 'master' into MAHOUT-1572
>>>> | |
>>>> | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
>>>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | |     Date:   Wed Jun 4 15:10:11 2014 -0700
>>>> | |
>>>> | |         initial fix (?)
>>>> | |
>>>> | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
>>>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | | Date:   Tue Jun 10 10:48:55 2014 -0700
>>>> | |
>>>> | |     MAHOUT-1571: Functional Views are not serialized as
>>> dense/sparse
>>>> correctly
>>>> | |
>>>> | |     This closes apache/mahout#9
>>>> | |
>>>> | |     Squashed commit of the following:
>>>> | |
>>>> | |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
>>>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | |     Date:   Tue Jun 10 10:46:17 2014 -0700
>>>> | |
>>>> | |         Adding test
>>>> | |
>>>> | |     commit ef271380e16192b55c31c7b219195d6982587206
>>>> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | |     Date:   Wed Jun 4 14:43:24 2014 -0700
>>>> | |
>>>> | |         initial fix (?)
>>>> | |
>>>> | * commit 11046fb5273b559298111b201470d80cd6af43d9
>>>> | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>>> | | Date:   Mon Jun 9 12:17:00 2014 -0700
>>>> | |
>>>> | |     NOJIRA: switching AlS to mahout's random from scala random to
>>>> ensure deterministic test for the time being.
>>>> | |
>>>> * |   commit d319b325066620a82d079379564188912e8b0b92
>>>> |\ \  Merge: a12135b fcb436d
>>>> | |/  Author: pferrel <pa...@occamsmachete.com>
>>>> | |   Date:   Mon Jun 9 07:01:15 2014 -0700
>>>> | |
>>>> | |       Merge branch 'master' of
>>>> https://git-wip-us.apache.org/repos/asf/mahout
>>>> | |
>>>> | * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
>>>> | | Author: Ted Dunning <td...@apache.org>
>>>> | | Date:   Sun Jun 8 21:18:09 2014 -0700
>>>> | |
>>>> | |     MAHOUT-1577 - Restore visibility for getYtransposeY
>>>> | |
>>>> | * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
>>>> | | Author: Ted Dunning <td...@apache.org>
>>>> | | Date:   Sun Jun 8 20:57:37 2014 -0700
>>>> | |
>>>> | |     MAHOUT-1577 - Kill a few more warnings and turn off several
>>> (like
>>>> newline in format string, non-final method call in constructor)
>>>> | |
>>>> | * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
>>>> | | Author: Ted Dunning <td...@apache.org>
>>>> | | Date:   Sun Jun 8 18:24:48 2014 -0700
>>>> | |
>>>> | |     MAHOUT-1576 - Fix several low hanging warnings, the most
>>> important
>>>> have to do with over-ridable operations in a constructor
>>>> | |
>>>> * |   commit a12135b94002367046ef6edc977527d586026689
>>>> |\ \  Merge: cc9a70e 99fd9ba
>>>> | |/  Author: pferrel <pa...@occamsmachete.com>
>>>> | |   Date:   Sun Jun 8 08:25:36 2014 -0700
>>>> | |
>>>> | |       Merge branch 'master' of
>>>> https://git-wip-us.apache.org/repos/asf/mahout
>>>> | |
>>>> | * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
>>>> | | Author: Ted Dunning <td...@apache.org>
>>>> | | Date:   Sat Jun 7 15:09:10 2014 -0700
>>>> | |
>>>> | |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
>>>> | |
>>>> * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
>>>> |/  Author: pferrel <pa...@occamsmachete.com>
>>>> |   Date:   Sat Jun 7 13:36:12 2014 -0700
>>>> |
>>>> 
>>>> 
>>> 
>>> 
>> 
>

Re: master branch history and Git commits - please DO squash your working branches before merging in

Posted by Dmitriy Lyubimov <dl...@gmail.com>.
sorry should read "add your branch again with a squash"

On Fri, Jun 13, 2014 at 1:24 PM, Dmitriy Lyubimov <dl...@gmail.com> wrote:

> if you try to reset master to last Sebastian commit before your last
> merge,
>
> git reset --hard a8e09cd3aa1c9d6
>
> and then print the graph again, you'd see that there were single path of
> succession before your last push that brought in all the merges on your
> other path of succession. How that happened on your local git, i of course
> can't reverse-engineer, but there gotta be a human error somewhere.
>
> if i were to repair it, i'd do just that then do forceful push back and
> try to add your branch again with a merge. then there would be one clean
> "star"-marked commit on top of Sebastian's commit. But the infra doesn't
> let us, so now it has to stay as is.
>
> it's ok i suppose, git is a bit tricky to get used to. As long as we
> realize what's happening.
>
> -d
>
>
>
>
> On Fri, Jun 13, 2014 at 1:05 PM, Dmitriy Lyubimov <dl...@gmail.com>
> wrote:
>
>> it is the same history that i printed, in chronological order and not
>> showing graph of it. No contradiction here whatsoever. Github is not shoing
>> the entire graph (try git log --graph --date-order to see true succession
>> graph structure. You want to see one single line of succession, not the
>> weaving patterns of multiple succession paths and merges).
>>
>>
>>
>>
>> On Fri, Jun 13, 2014 at 12:35 PM, Pat Ferrel <pa...@gmail.com>
>> wrote:
>>
>>> It doesn’t show all the commit messages by any means. Look
>>> https://github.com/apache/mahout/commits/master?page=1
>>>
>>> It shows 6 commit messages, all but 2 are times when I merged master
>>> into my branch (never pushed those to the apache master so I bet these are
>>> exceptions to squash). One is the commit before pushing. So all of those
>>> seem ok.
>>>
>>> The weird one is a change to .gitignore ???, which I have no explanation
>>> for.
>>>
>>> You looking somewhere else?
>>>
>>> On Jun 13, 2014, at 11:38 AM, Dmitriy Lyubimov <dl...@gmail.com>
>>> wrote:
>>>
>>> the recipe seems ok but obviously something wrong did happen since we
>>> still
>>> see your history in master.
>>>
>>> I'd suggest to check the history explicitly before pushing if unsure.
>>>
>>> ASF hooks prevent repairing history (as in rewriting history), and for a
>>> good reason since one got to be even more accurate while doing that than
>>> during simple squash merge, so we cannot undo it now and i guess we'd
>>> have
>>> to do what we do a bit more reverently when it comes to pushing to
>>> master.
>>>
>>> -d
>>>
>>>
>>> On Fri, Jun 13, 2014 at 11:30 AM, Pat Ferrel <pa...@gmail.com>
>>> wrote:
>>>
>>> > I did a:
>>> >
>>> > git checkout master
>>> > git merge --squash mahout-1464
>>> >
>>> > did my build, tests, updated changelog then
>>> >
>>> > git commit -a -m “yada yada close PR message"
>>> > git push apache master
>>> >
>>> > something wrong there?
>>> >
>>> > On Jun 13, 2014, at 11:05 AM, Dmitriy Lyubimov <dl...@gmail.com>
>>> wrote:
>>> >
>>> > Hi,
>>> >
>>> > I would like to suggest to prohibit merges and intermediate commits in
>>> the
>>> > master branch. Please   --squash history from the working branch (as
>>> > defined in PR merge page)!
>>> >
>>> > Not squashing working branch history  makes it difficult to (1)
>>> attribute
>>> > intermediate commits to a Mahout issue as not all intermediate commit
>>> > messages clearly state so; and (2) be able to correct history if
>>> needed,
>>> > with rollbacks.
>>> >
>>> > (I do list working branch history in commit description; or, rather,
>>> git
>>> > does it automatically for me, but they are not commits in the master).
>>> >
>>> > Bottom line, it is a mess (Pat, i am winking at you :)
>>> >
>>> > * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
>>> > | Author: pferrel <pa...@occamsmachete.com>
>>> > | Date:   Thu Jun 12 17:45:09 2014 -0700
>>> > |
>>> > |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
>>> > apache/mahout#12
>>> > |
>>> > *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
>>> > |\  Merge: fd7a0bf a8e09cd
>>> > | | Author: pferrel <pa...@occamsmachete.com>
>>> > | | Date:   Thu Jun 12 11:33:55 2014 -0700
>>> > | |
>>> > | |     Merge branch 'master' of
>>> > https://git-wip-us.apache.org/repos/asf/mahout
>>> > | |
>>> > | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
>>> > | | Author: ssc <ss...@apache.org>
>>> > | | Date:   Thu Jun 12 19:03:19 2014 +0200
>>> > | |
>>> > | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
>>> > apache/mahout#16
>>> > | |
>>> > * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
>>> > |\ \  Merge: d319b32 b044a07
>>> > | |/  Author: pferrel <pa...@occamsmachete.com>
>>> > | |   Date:   Wed Jun 11 19:17:59 2014 -0700
>>> > | |
>>> > | |       Merge branch 'master' of
>>> > https://git-wip-us.apache.org/repos/asf/mahout
>>> > | |
>>> > | * commit b044a07797a8fef23d10f10126615c9b7db659bb
>>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | | Date:   Tue Jun 10 11:46:32 2014 -0700
>>> > | |
>>> > | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
>>> > | |
>>> > | |     This closes apache/mahout#15
>>> > | |
>>> > | |     Squashed commit of the following:
>>> > | |
>>> > | |     commit 0407577bff365028ceef9798d5835f12a81bc941
>>> > | |     Author: Anand Avati <av...@redhat.com>
>>> > | |     Date:   Mon Jun 9 22:05:14 2014 -0700
>>> > | |
>>> > | |         MAHOUT-1529: spark-shell - cleanup sdc
>>> > | |
>>> > | |         Renaming @sc to @sdc has left open the shutdown part. Spark
>>> > | |         depends on 'implicit sc' to be set by the shell invoker.
>>> > | |
>>> > | |           mahout> Stopping spark context.
>>> > | |           <console>:29: error: not found: value sc
>>> > | |                         sc.stop()
>>> > | |                         ^
>>> > | |
>>> > | |         So override sparkCleanUp() and call @sdc.stop()
>>> > | |
>>> > | |         Signed-off-by: Anand Avati <av...@redhat.com>
>>> > | |
>>> > | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
>>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | | Date:   Tue Jun 10 11:30:55 2014 -0700
>>> > | |
>>> > | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity
>>> in
>>> > the loaded data
>>> > | |
>>> > | |     This closes apache/mahout#10
>>> > | |
>>> > | |     Squashed commit of the following:
>>> > | |
>>> > | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
>>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | |     Date:   Tue Jun 10 11:27:38 2014 -0700
>>> > | |
>>> > | |         + tests
>>> > | |
>>> > | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
>>> > | |     Merge: 162c5ca 907781b
>>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | |     Date:   Tue Jun 10 11:04:51 2014 -0700
>>> > | |
>>> > | |         Merge branch 'master' into MAHOUT-1572
>>> > | |
>>> > | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
>>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | |     Date:   Wed Jun 4 15:10:11 2014 -0700
>>> > | |
>>> > | |         initial fix (?)
>>> > | |
>>> > | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
>>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | | Date:   Tue Jun 10 10:48:55 2014 -0700
>>> > | |
>>> > | |     MAHOUT-1571: Functional Views are not serialized as
>>> dense/sparse
>>> > correctly
>>> > | |
>>> > | |     This closes apache/mahout#9
>>> > * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
>>> > | Author: pferrel <pa...@occamsmachete.com>
>>> > | Date:   Thu Jun 12 17:45:09 2014 -0700
>>> > |
>>> > |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
>>> > apache/mahout#12
>>> > |
>>> > *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
>>> > |\  Merge: fd7a0bf a8e09cd
>>> > | | Author: pferrel <pa...@occamsmachete.com>
>>> > | | Date:   Thu Jun 12 11:33:55 2014 -0700
>>> > | |
>>> > | |     Merge branch 'master' of
>>> > https://git-wip-us.apache.org/repos/asf/mahout
>>> > | |
>>> > | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
>>> > | | Author: ssc <ss...@apache.org>
>>> > | | Date:   Thu Jun 12 19:03:19 2014 +0200
>>> > | |
>>> > | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
>>> > apache/mahout#16
>>> > | |
>>> > * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
>>> > |\ \  Merge: d319b32 b044a07
>>> > | |/  Author: pferrel <pa...@occamsmachete.com>
>>> > | |   Date:   Wed Jun 11 19:17:59 2014 -0700
>>> > | |
>>> > | |       Merge branch 'master' of
>>> > https://git-wip-us.apache.org/repos/asf/mahout
>>> > | |
>>> > | * commit b044a07797a8fef23d10f10126615c9b7db659bb
>>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | | Date:   Tue Jun 10 11:46:32 2014 -0700
>>> > | |
>>> > | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
>>> > | |
>>> > | |     This closes apache/mahout#15
>>> > | |
>>> > | |     Squashed commit of the following:
>>> > | |
>>> > | |     commit 0407577bff365028ceef9798d5835f12a81bc941
>>> > | |     Author: Anand Avati <av...@redhat.com>
>>> > | |     Date:   Mon Jun 9 22:05:14 2014 -0700
>>> > | |
>>> > | |         MAHOUT-1529: spark-shell - cleanup sdc
>>> > | |
>>> > | |         Renaming @sc to @sdc has left open the shutdown part. Spark
>>> > | |         depends on 'implicit sc' to be set by the shell invoker.
>>> > | |
>>> > | |           mahout> Stopping spark context.
>>> > | |           <console>:29: error: not found: value sc
>>> > | |                         sc.stop()
>>> > | |                         ^
>>> > | |
>>> > | |         So override sparkCleanUp() and call @sdc.stop()
>>> > | |
>>> > | |         Signed-off-by: Anand Avati <av...@redhat.com>
>>> > | |
>>> > | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
>>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | | Date:   Tue Jun 10 11:30:55 2014 -0700
>>> > | |
>>> > | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity
>>> in
>>> > the loaded data
>>> > | |
>>> > | |     This closes apache/mahout#10
>>> > | |
>>> > | |     Squashed commit of the following:
>>> > | |
>>> > | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
>>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | |     Date:   Tue Jun 10 11:27:38 2014 -0700
>>> > | |
>>> > | |         + tests
>>> > | |
>>> > | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
>>> > | |     Merge: 162c5ca 907781b
>>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | |     Date:   Tue Jun 10 11:04:51 2014 -0700
>>> > | |
>>> > | |         Merge branch 'master' into MAHOUT-1572
>>> > | |
>>> > | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
>>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | |     Date:   Wed Jun 4 15:10:11 2014 -0700
>>> > | |
>>> > | |         initial fix (?)
>>> > | |
>>> > | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
>>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | | Date:   Tue Jun 10 10:48:55 2014 -0700
>>> > | |
>>> > | |     MAHOUT-1571: Functional Views are not serialized as
>>> dense/sparse
>>> > correctly
>>> > | |
>>> > | |     This closes apache/mahout#9
>>> > | |
>>> > | |     Squashed commit of the following:
>>> > | |
>>> > | |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
>>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | |     Date:   Tue Jun 10 10:46:17 2014 -0700
>>> > | |
>>> > | |         Adding test
>>> > | |
>>> > | |     commit ef271380e16192b55c31c7b219195d6982587206
>>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | |     Date:   Wed Jun 4 14:43:24 2014 -0700
>>> > | |
>>> > | |         initial fix (?)
>>> > | |
>>> > | * commit 11046fb5273b559298111b201470d80cd6af43d9
>>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | | Date:   Mon Jun 9 12:17:00 2014 -0700
>>> > | |
>>> > | |     NOJIRA: switching AlS to mahout's random from scala random to
>>> > ensure deterministic test for the time being.
>>> > | |
>>> > * |   commit d319b325066620a82d079379564188912e8b0b92
>>> > |\ \  Merge: a12135b fcb436d
>>> > | |/  Author: pferrel <pa...@occamsmachete.com>
>>> > | |   Date:   Mon Jun 9 07:01:15 2014 -0700
>>> > | |
>>> > | |       Merge branch 'master' of
>>> > https://git-wip-us.apache.org/repos/asf/mahout
>>> > | |
>>> > | * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
>>> > | | Author: Ted Dunning <td...@apache.org>
>>> > | | Date:   Sun Jun 8 21:18:09 2014 -0700
>>> > | |
>>> > | |     MAHOUT-1577 - Restore visibility for getYtransposeY
>>> > | |
>>> > | * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
>>> > | | Author: Ted Dunning <td...@apache.org>
>>> > | | Date:   Sun Jun 8 20:57:37 2014 -0700
>>> > | |
>>> > | |     MAHOUT-1577 - Kill a few more warnings and turn off several
>>> (like
>>> > newline in format string, non-final method call in constructor)
>>> > | |
>>> > | * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
>>> > | | Author: Ted Dunning <td...@apache.org>
>>> > | | Date:   Sun Jun 8 18:24:48 2014 -0700
>>> > | |
>>> > | |     MAHOUT-1576 - Fix several low hanging warnings, the most
>>> important
>>> > have to do with over-ridable operations in a constructor
>>> > | |
>>> > * |   commit a12135b94002367046ef6edc977527d586026689
>>> > |\ \  Merge: cc9a70e 99fd9ba
>>> > | |/  Author: pferrel <pa...@occamsmachete.com>
>>> > | |   Date:   Sun Jun 8 08:25:36 2014 -0700
>>> > | |
>>> > | |       Merge branch 'master' of
>>> > https://git-wip-us.apache.org/repos/asf/mahout
>>> > | |
>>> > | * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
>>> > | | Author: Ted Dunning <td...@apache.org>
>>> > | | Date:   Sat Jun 7 15:09:10 2014 -0700
>>> > | |
>>> > | |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
>>> > | |
>>> > * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
>>> > |/  Author: pferrel <pa...@occamsmachete.com>
>>> > |   Date:   Sat Jun 7 13:36:12 2014 -0700
>>> > |
>>> > |       added .DS_Store to gitignore for pushes from mac
>>> > |
>>> > * commit 63b765abb305cca6d726f54549a92018754a6348
>>> > * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
>>> > | Author: pferrel <pa...@occamsmachete.com>
>>> > | Date:   Thu Jun 12 17:45:09 2014 -0700
>>> > |
>>> > |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
>>> > apache/mahout#12
>>> > |
>>> > *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
>>> > |\  Merge: fd7a0bf a8e09cd
>>> > | | Author: pferrel <pa...@occamsmachete.com>
>>> > | | Date:   Thu Jun 12 11:33:55 2014 -0700
>>> > | |
>>> > | |     Merge branch 'master' of
>>> > https://git-wip-us.apache.org/repos/asf/mahout
>>> > | |
>>> > | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
>>> > | | Author: ssc <ss...@apache.org>
>>> > | | Date:   Thu Jun 12 19:03:19 2014 +0200
>>> > | |
>>> > | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
>>> > apache/mahout#16
>>> > | |
>>> > * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
>>> > |\ \  Merge: d319b32 b044a07
>>> > | |/  Author: pferrel <pa...@occamsmachete.com>
>>> > | |   Date:   Wed Jun 11 19:17:59 2014 -0700
>>> > | |
>>> > | |       Merge branch 'master' of
>>> > https://git-wip-us.apache.org/repos/asf/mahout
>>> > | |
>>> > | * commit b044a07797a8fef23d10f10126615c9b7db659bb
>>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | | Date:   Tue Jun 10 11:46:32 2014 -0700
>>> > | |
>>> > | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
>>> > | |
>>> > | |     This closes apache/mahout#15
>>> > | |
>>> > | |     Squashed commit of the following:
>>> > | |
>>> > | |     commit 0407577bff365028ceef9798d5835f12a81bc941
>>> > | |     Author: Anand Avati <av...@redhat.com>
>>> > | |     Date:   Mon Jun 9 22:05:14 2014 -0700
>>> > | |
>>> > | |         MAHOUT-1529: spark-shell - cleanup sdc
>>> > | |
>>> > | |         Renaming @sc to @sdc has left open the shutdown part. Spark
>>> > | |         depends on 'implicit sc' to be set by the shell invoker.
>>> > | |
>>> > | |           mahout> Stopping spark context.
>>> > | |           <console>:29: error: not found: value sc
>>> > | |                         sc.stop()
>>> > | |                         ^
>>> > | |
>>> > | |         So override sparkCleanUp() and call @sdc.stop()
>>> > | |
>>> > | |         Signed-off-by: Anand Avati <av...@redhat.com>
>>> > | |
>>> > | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
>>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | | Date:   Tue Jun 10 11:30:55 2014 -0700
>>> > | |
>>> > | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity
>>> in
>>> > the loaded data
>>> > | |
>>> > | |     This closes apache/mahout#10
>>> > | |
>>> > | |     Squashed commit of the following:
>>> > | |
>>> > | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
>>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | |     Date:   Tue Jun 10 11:27:38 2014 -0700
>>> > | |
>>> > | |         + tests
>>> > | |
>>> > | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
>>> > | |     Merge: 162c5ca 907781b
>>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | |     Date:   Tue Jun 10 11:04:51 2014 -0700
>>> > | |
>>> > | |         Merge branch 'master' into MAHOUT-1572
>>> > | |
>>> > | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
>>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | |     Date:   Wed Jun 4 15:10:11 2014 -0700
>>> > | |
>>> > | |         initial fix (?)
>>> > | |
>>> > | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
>>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | | Date:   Tue Jun 10 10:48:55 2014 -0700
>>> > | |
>>> > | |     MAHOUT-1571: Functional Views are not serialized as
>>> dense/sparse
>>> > correctly
>>> > | |
>>> > | |     This closes apache/mahout#9
>>> > | |
>>> > | |     Squashed commit of the following:
>>> > | |
>>> > | |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
>>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | |     Date:   Tue Jun 10 10:46:17 2014 -0700
>>> > | |
>>> > | |         Adding test
>>> > | |
>>> > | |     commit ef271380e16192b55c31c7b219195d6982587206
>>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | |     Date:   Wed Jun 4 14:43:24 2014 -0700
>>> > | |
>>> > | |         initial fix (?)
>>> > | |
>>> > | * commit 11046fb5273b559298111b201470d80cd6af43d9
>>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | | Date:   Mon Jun 9 12:17:00 2014 -0700
>>> > | |
>>> > | |     NOJIRA: switching AlS to mahout's random from scala random to
>>> > ensure deterministic test for the time being.
>>> > | |
>>> > * |   commit d319b325066620a82d079379564188912e8b0b92
>>> > |\ \  Merge: a12135b fcb436d
>>> > | |/  Author: pferrel <pa...@occamsmachete.com>
>>> > | |   Date:   Mon Jun 9 07:01:15 2014 -0700
>>> > | |
>>> > | |       Merge branch 'master' of
>>> > https://git-wip-us.apache.org/repos/asf/mahout
>>> > | |
>>> > | * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
>>> > | | Author: Ted Dunning <td...@apache.org>
>>> > | | Date:   Sun Jun 8 21:18:09 2014 -0700
>>> > | |
>>> > | |     MAHOUT-1577 - Restore visibility for getYtransposeY
>>> > | |
>>> > | * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
>>> > | | Author: Ted Dunning <td...@apache.org>
>>> > | | Date:   Sun Jun 8 20:57:37 2014 -0700
>>> > | |
>>> > | |     MAHOUT-1577 - Kill a few more warnings and turn off several
>>> (like
>>> > newline in format string, non-final method call in constructor)
>>> > | |
>>> > | * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
>>> > | | Author: Ted Dunning <td...@apache.org>
>>> > | | Date:   Sun Jun 8 18:24:48 2014 -0700
>>> > | |
>>> > | |     MAHOUT-1576 - Fix several low hanging warnings, the most
>>> important
>>> > have to do with over-ridable operations in a constructor
>>> > | |
>>> > * |   commit a12135b94002367046ef6edc977527d586026689
>>> > |\ \  Merge: cc9a70e 99fd9ba
>>> > | |/  Author: pferrel <pa...@occamsmachete.com>
>>> > | |   Date:   Sun Jun 8 08:25:36 2014 -0700
>>> > | |
>>> > | |       Merge branch 'master' of
>>> > https://git-wip-us.apache.org/repos/asf/mahout
>>> > | |
>>> > | * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
>>> > | | Author: Ted Dunning <td...@apache.org>
>>> > | | Date:   Sat Jun 7 15:09:10 2014 -0700
>>> > | |
>>> > | |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
>>> > | |
>>> > * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
>>> > |/  Author: pferrel <pa...@occamsmachete.com>
>>> > |   Date:   Sat Jun 7 13:36:12 2014 -0700
>>> > |
>>> > |       added .DS_Store to gitignore for pushes from mac
>>> > |
>>> > * commit 63b765abb305cca6d726f54549a92018754a6348
>>> > * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
>>> > | Author: pferrel <pa...@occamsmachete.com>
>>> > | Date:   Thu Jun 12 17:45:09 2014 -0700
>>> > |
>>> > |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
>>> > apache/mahout#12
>>> > |
>>> > *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
>>> > |\  Merge: fd7a0bf a8e09cd
>>> > | | Author: pferrel <pa...@occamsmachete.com>
>>> > | | Date:   Thu Jun 12 11:33:55 2014 -0700
>>> > | |
>>> > | |     Merge branch 'master' of
>>> > https://git-wip-us.apache.org/repos/asf/mahout
>>> > | |
>>> > | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
>>> > | | Author: ssc <ss...@apache.org>
>>> > | | Date:   Thu Jun 12 19:03:19 2014 +0200
>>> > | |
>>> > | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
>>> > apache/mahout#16
>>> > | |
>>> > * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
>>> > |\ \  Merge: d319b32 b044a07
>>> > | |/  Author: pferrel <pa...@occamsmachete.com>
>>> > | |   Date:   Wed Jun 11 19:17:59 2014 -0700
>>> > | |
>>> > | |       Merge branch 'master' of
>>> > https://git-wip-us.apache.org/repos/asf/mahout
>>> > | |
>>> > | * commit b044a07797a8fef23d10f10126615c9b7db659bb
>>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | | Date:   Tue Jun 10 11:46:32 2014 -0700
>>> > | |
>>> > | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
>>> > | |
>>> > | |     This closes apache/mahout#15
>>> > | |
>>> > | |     Squashed commit of the following:
>>> > | |
>>> > | |     commit 0407577bff365028ceef9798d5835f12a81bc941
>>> > | |     Author: Anand Avati <av...@redhat.com>
>>> > | |     Date:   Mon Jun 9 22:05:14 2014 -0700
>>> > | |
>>> > | |         MAHOUT-1529: spark-shell - cleanup sdc
>>> > | |
>>> > | |         Renaming @sc to @sdc has left open the shutdown part. Spark
>>> > | |         depends on 'implicit sc' to be set by the shell invoker.
>>> > | |
>>> > | |           mahout> Stopping spark context.
>>> > | |           <console>:29: error: not found: value sc
>>> > | |                         sc.stop()
>>> > | |                         ^
>>> > | |
>>> > | |         So override sparkCleanUp() and call @sdc.stop()
>>> > | |
>>> > | |         Signed-off-by: Anand Avati <av...@redhat.com>
>>> > | |
>>> > | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
>>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | | Date:   Tue Jun 10 11:30:55 2014 -0700
>>> > | |
>>> > | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity
>>> in
>>> > the loaded data
>>> > | |
>>> > | |     This closes apache/mahout#10
>>> > | |
>>> > | |     Squashed commit of the following:
>>> > | |
>>> > | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
>>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | |     Date:   Tue Jun 10 11:27:38 2014 -0700
>>> > | |
>>> > | |         + tests
>>> > | |
>>> > | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
>>> > | |     Merge: 162c5ca 907781b
>>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | |     Date:   Tue Jun 10 11:04:51 2014 -0700
>>> > | |
>>> > | |         Merge branch 'master' into MAHOUT-1572
>>> > | |
>>> > | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
>>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | |     Date:   Wed Jun 4 15:10:11 2014 -0700
>>> > | |
>>> > | |         initial fix (?)
>>> > | |
>>> > | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
>>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | | Date:   Tue Jun 10 10:48:55 2014 -0700
>>> > | |
>>> > | |     MAHOUT-1571: Functional Views are not serialized as
>>> dense/sparse
>>> > correctly
>>> > | |
>>> > | |     This closes apache/mahout#9
>>> > | |
>>> > | |     Squashed commit of the following:
>>> > | |
>>> > | |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
>>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | |     Date:   Tue Jun 10 10:46:17 2014 -0700
>>> > | |
>>> > | |         Adding test
>>> > | |
>>> > | |     commit ef271380e16192b55c31c7b219195d6982587206
>>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | |     Date:   Wed Jun 4 14:43:24 2014 -0700
>>> > | |
>>> > | |         initial fix (?)
>>> > | |
>>> > | * commit 11046fb5273b559298111b201470d80cd6af43d9
>>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>>> > | | Date:   Mon Jun 9 12:17:00 2014 -0700
>>> > | |
>>> > | |     NOJIRA: switching AlS to mahout's random from scala random to
>>> > ensure deterministic test for the time being.
>>> > | |
>>> > * |   commit d319b325066620a82d079379564188912e8b0b92
>>> > |\ \  Merge: a12135b fcb436d
>>> > | |/  Author: pferrel <pa...@occamsmachete.com>
>>> > | |   Date:   Mon Jun 9 07:01:15 2014 -0700
>>> > | |
>>> > | |       Merge branch 'master' of
>>> > https://git-wip-us.apache.org/repos/asf/mahout
>>> > | |
>>> > | * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
>>> > | | Author: Ted Dunning <td...@apache.org>
>>> > | | Date:   Sun Jun 8 21:18:09 2014 -0700
>>> > | |
>>> > | |     MAHOUT-1577 - Restore visibility for getYtransposeY
>>> > | |
>>> > | * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
>>> > | | Author: Ted Dunning <td...@apache.org>
>>> > | | Date:   Sun Jun 8 20:57:37 2014 -0700
>>> > | |
>>> > | |     MAHOUT-1577 - Kill a few more warnings and turn off several
>>> (like
>>> > newline in format string, non-final method call in constructor)
>>> > | |
>>> > | * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
>>> > | | Author: Ted Dunning <td...@apache.org>
>>> > | | Date:   Sun Jun 8 18:24:48 2014 -0700
>>> > | |
>>> > | |     MAHOUT-1576 - Fix several low hanging warnings, the most
>>> important
>>> > have to do with over-ridable operations in a constructor
>>> > | |
>>> > * |   commit a12135b94002367046ef6edc977527d586026689
>>> > |\ \  Merge: cc9a70e 99fd9ba
>>> > | |/  Author: pferrel <pa...@occamsmachete.com>
>>> > | |   Date:   Sun Jun 8 08:25:36 2014 -0700
>>> > | |
>>> > | |       Merge branch 'master' of
>>> > https://git-wip-us.apache.org/repos/asf/mahout
>>> > | |
>>> > | * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
>>> > | | Author: Ted Dunning <td...@apache.org>
>>> > | | Date:   Sat Jun 7 15:09:10 2014 -0700
>>> > | |
>>> > | |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
>>> > | |
>>> > * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
>>> > |/  Author: pferrel <pa...@occamsmachete.com>
>>> > |   Date:   Sat Jun 7 13:36:12 2014 -0700
>>> > |
>>> >
>>> >
>>>
>>>
>>
>

Re: master branch history and Git commits - please DO squash your working branches before merging in

Posted by Dmitriy Lyubimov <dl...@gmail.com>.
if you try to reset master to last Sebastian commit before your last merge,

git reset --hard a8e09cd3aa1c9d6

and then print the graph again, you'd see that there were single path of
succession before your last push that brought in all the merges on your
other path of succession. How that happened on your local git, i of course
can't reverse-engineer, but there gotta be a human error somewhere.

if i were to repair it, i'd do just that then do forceful push back and try
to add your branch again with a merge. then there would be one clean
"star"-marked commit on top of Sebastian's commit. But the infra doesn't
let us, so now it has to stay as is.

it's ok i suppose, git is a bit tricky to get used to. As long as we
realize what's happening.

-d




On Fri, Jun 13, 2014 at 1:05 PM, Dmitriy Lyubimov <dl...@gmail.com> wrote:

> it is the same history that i printed, in chronological order and not
> showing graph of it. No contradiction here whatsoever. Github is not shoing
> the entire graph (try git log --graph --date-order to see true succession
> graph structure. You want to see one single line of succession, not the
> weaving patterns of multiple succession paths and merges).
>
>
>
>
> On Fri, Jun 13, 2014 at 12:35 PM, Pat Ferrel <pa...@gmail.com> wrote:
>
>> It doesn’t show all the commit messages by any means. Look
>> https://github.com/apache/mahout/commits/master?page=1
>>
>> It shows 6 commit messages, all but 2 are times when I merged master into
>> my branch (never pushed those to the apache master so I bet these are
>> exceptions to squash). One is the commit before pushing. So all of those
>> seem ok.
>>
>> The weird one is a change to .gitignore ???, which I have no explanation
>> for.
>>
>> You looking somewhere else?
>>
>> On Jun 13, 2014, at 11:38 AM, Dmitriy Lyubimov <dl...@gmail.com> wrote:
>>
>> the recipe seems ok but obviously something wrong did happen since we
>> still
>> see your history in master.
>>
>> I'd suggest to check the history explicitly before pushing if unsure.
>>
>> ASF hooks prevent repairing history (as in rewriting history), and for a
>> good reason since one got to be even more accurate while doing that than
>> during simple squash merge, so we cannot undo it now and i guess we'd have
>> to do what we do a bit more reverently when it comes to pushing to master.
>>
>> -d
>>
>>
>> On Fri, Jun 13, 2014 at 11:30 AM, Pat Ferrel <pa...@gmail.com>
>> wrote:
>>
>> > I did a:
>> >
>> > git checkout master
>> > git merge --squash mahout-1464
>> >
>> > did my build, tests, updated changelog then
>> >
>> > git commit -a -m “yada yada close PR message"
>> > git push apache master
>> >
>> > something wrong there?
>> >
>> > On Jun 13, 2014, at 11:05 AM, Dmitriy Lyubimov <dl...@gmail.com>
>> wrote:
>> >
>> > Hi,
>> >
>> > I would like to suggest to prohibit merges and intermediate commits in
>> the
>> > master branch. Please   --squash history from the working branch (as
>> > defined in PR merge page)!
>> >
>> > Not squashing working branch history  makes it difficult to (1)
>> attribute
>> > intermediate commits to a Mahout issue as not all intermediate commit
>> > messages clearly state so; and (2) be able to correct history if needed,
>> > with rollbacks.
>> >
>> > (I do list working branch history in commit description; or, rather, git
>> > does it automatically for me, but they are not commits in the master).
>> >
>> > Bottom line, it is a mess (Pat, i am winking at you :)
>> >
>> > * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
>> > | Author: pferrel <pa...@occamsmachete.com>
>> > | Date:   Thu Jun 12 17:45:09 2014 -0700
>> > |
>> > |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
>> > apache/mahout#12
>> > |
>> > *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
>> > |\  Merge: fd7a0bf a8e09cd
>> > | | Author: pferrel <pa...@occamsmachete.com>
>> > | | Date:   Thu Jun 12 11:33:55 2014 -0700
>> > | |
>> > | |     Merge branch 'master' of
>> > https://git-wip-us.apache.org/repos/asf/mahout
>> > | |
>> > | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
>> > | | Author: ssc <ss...@apache.org>
>> > | | Date:   Thu Jun 12 19:03:19 2014 +0200
>> > | |
>> > | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
>> > apache/mahout#16
>> > | |
>> > * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
>> > |\ \  Merge: d319b32 b044a07
>> > | |/  Author: pferrel <pa...@occamsmachete.com>
>> > | |   Date:   Wed Jun 11 19:17:59 2014 -0700
>> > | |
>> > | |       Merge branch 'master' of
>> > https://git-wip-us.apache.org/repos/asf/mahout
>> > | |
>> > | * commit b044a07797a8fef23d10f10126615c9b7db659bb
>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | | Date:   Tue Jun 10 11:46:32 2014 -0700
>> > | |
>> > | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
>> > | |
>> > | |     This closes apache/mahout#15
>> > | |
>> > | |     Squashed commit of the following:
>> > | |
>> > | |     commit 0407577bff365028ceef9798d5835f12a81bc941
>> > | |     Author: Anand Avati <av...@redhat.com>
>> > | |     Date:   Mon Jun 9 22:05:14 2014 -0700
>> > | |
>> > | |         MAHOUT-1529: spark-shell - cleanup sdc
>> > | |
>> > | |         Renaming @sc to @sdc has left open the shutdown part. Spark
>> > | |         depends on 'implicit sc' to be set by the shell invoker.
>> > | |
>> > | |           mahout> Stopping spark context.
>> > | |           <console>:29: error: not found: value sc
>> > | |                         sc.stop()
>> > | |                         ^
>> > | |
>> > | |         So override sparkCleanUp() and call @sdc.stop()
>> > | |
>> > | |         Signed-off-by: Anand Avati <av...@redhat.com>
>> > | |
>> > | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | | Date:   Tue Jun 10 11:30:55 2014 -0700
>> > | |
>> > | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
>> > the loaded data
>> > | |
>> > | |     This closes apache/mahout#10
>> > | |
>> > | |     Squashed commit of the following:
>> > | |
>> > | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | |     Date:   Tue Jun 10 11:27:38 2014 -0700
>> > | |
>> > | |         + tests
>> > | |
>> > | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
>> > | |     Merge: 162c5ca 907781b
>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | |     Date:   Tue Jun 10 11:04:51 2014 -0700
>> > | |
>> > | |         Merge branch 'master' into MAHOUT-1572
>> > | |
>> > | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | |     Date:   Wed Jun 4 15:10:11 2014 -0700
>> > | |
>> > | |         initial fix (?)
>> > | |
>> > | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | | Date:   Tue Jun 10 10:48:55 2014 -0700
>> > | |
>> > | |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
>> > correctly
>> > | |
>> > | |     This closes apache/mahout#9
>> > * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
>> > | Author: pferrel <pa...@occamsmachete.com>
>> > | Date:   Thu Jun 12 17:45:09 2014 -0700
>> > |
>> > |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
>> > apache/mahout#12
>> > |
>> > *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
>> > |\  Merge: fd7a0bf a8e09cd
>> > | | Author: pferrel <pa...@occamsmachete.com>
>> > | | Date:   Thu Jun 12 11:33:55 2014 -0700
>> > | |
>> > | |     Merge branch 'master' of
>> > https://git-wip-us.apache.org/repos/asf/mahout
>> > | |
>> > | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
>> > | | Author: ssc <ss...@apache.org>
>> > | | Date:   Thu Jun 12 19:03:19 2014 +0200
>> > | |
>> > | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
>> > apache/mahout#16
>> > | |
>> > * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
>> > |\ \  Merge: d319b32 b044a07
>> > | |/  Author: pferrel <pa...@occamsmachete.com>
>> > | |   Date:   Wed Jun 11 19:17:59 2014 -0700
>> > | |
>> > | |       Merge branch 'master' of
>> > https://git-wip-us.apache.org/repos/asf/mahout
>> > | |
>> > | * commit b044a07797a8fef23d10f10126615c9b7db659bb
>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | | Date:   Tue Jun 10 11:46:32 2014 -0700
>> > | |
>> > | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
>> > | |
>> > | |     This closes apache/mahout#15
>> > | |
>> > | |     Squashed commit of the following:
>> > | |
>> > | |     commit 0407577bff365028ceef9798d5835f12a81bc941
>> > | |     Author: Anand Avati <av...@redhat.com>
>> > | |     Date:   Mon Jun 9 22:05:14 2014 -0700
>> > | |
>> > | |         MAHOUT-1529: spark-shell - cleanup sdc
>> > | |
>> > | |         Renaming @sc to @sdc has left open the shutdown part. Spark
>> > | |         depends on 'implicit sc' to be set by the shell invoker.
>> > | |
>> > | |           mahout> Stopping spark context.
>> > | |           <console>:29: error: not found: value sc
>> > | |                         sc.stop()
>> > | |                         ^
>> > | |
>> > | |         So override sparkCleanUp() and call @sdc.stop()
>> > | |
>> > | |         Signed-off-by: Anand Avati <av...@redhat.com>
>> > | |
>> > | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | | Date:   Tue Jun 10 11:30:55 2014 -0700
>> > | |
>> > | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
>> > the loaded data
>> > | |
>> > | |     This closes apache/mahout#10
>> > | |
>> > | |     Squashed commit of the following:
>> > | |
>> > | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | |     Date:   Tue Jun 10 11:27:38 2014 -0700
>> > | |
>> > | |         + tests
>> > | |
>> > | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
>> > | |     Merge: 162c5ca 907781b
>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | |     Date:   Tue Jun 10 11:04:51 2014 -0700
>> > | |
>> > | |         Merge branch 'master' into MAHOUT-1572
>> > | |
>> > | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | |     Date:   Wed Jun 4 15:10:11 2014 -0700
>> > | |
>> > | |         initial fix (?)
>> > | |
>> > | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | | Date:   Tue Jun 10 10:48:55 2014 -0700
>> > | |
>> > | |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
>> > correctly
>> > | |
>> > | |     This closes apache/mahout#9
>> > | |
>> > | |     Squashed commit of the following:
>> > | |
>> > | |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | |     Date:   Tue Jun 10 10:46:17 2014 -0700
>> > | |
>> > | |         Adding test
>> > | |
>> > | |     commit ef271380e16192b55c31c7b219195d6982587206
>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | |     Date:   Wed Jun 4 14:43:24 2014 -0700
>> > | |
>> > | |         initial fix (?)
>> > | |
>> > | * commit 11046fb5273b559298111b201470d80cd6af43d9
>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | | Date:   Mon Jun 9 12:17:00 2014 -0700
>> > | |
>> > | |     NOJIRA: switching AlS to mahout's random from scala random to
>> > ensure deterministic test for the time being.
>> > | |
>> > * |   commit d319b325066620a82d079379564188912e8b0b92
>> > |\ \  Merge: a12135b fcb436d
>> > | |/  Author: pferrel <pa...@occamsmachete.com>
>> > | |   Date:   Mon Jun 9 07:01:15 2014 -0700
>> > | |
>> > | |       Merge branch 'master' of
>> > https://git-wip-us.apache.org/repos/asf/mahout
>> > | |
>> > | * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
>> > | | Author: Ted Dunning <td...@apache.org>
>> > | | Date:   Sun Jun 8 21:18:09 2014 -0700
>> > | |
>> > | |     MAHOUT-1577 - Restore visibility for getYtransposeY
>> > | |
>> > | * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
>> > | | Author: Ted Dunning <td...@apache.org>
>> > | | Date:   Sun Jun 8 20:57:37 2014 -0700
>> > | |
>> > | |     MAHOUT-1577 - Kill a few more warnings and turn off several
>> (like
>> > newline in format string, non-final method call in constructor)
>> > | |
>> > | * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
>> > | | Author: Ted Dunning <td...@apache.org>
>> > | | Date:   Sun Jun 8 18:24:48 2014 -0700
>> > | |
>> > | |     MAHOUT-1576 - Fix several low hanging warnings, the most
>> important
>> > have to do with over-ridable operations in a constructor
>> > | |
>> > * |   commit a12135b94002367046ef6edc977527d586026689
>> > |\ \  Merge: cc9a70e 99fd9ba
>> > | |/  Author: pferrel <pa...@occamsmachete.com>
>> > | |   Date:   Sun Jun 8 08:25:36 2014 -0700
>> > | |
>> > | |       Merge branch 'master' of
>> > https://git-wip-us.apache.org/repos/asf/mahout
>> > | |
>> > | * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
>> > | | Author: Ted Dunning <td...@apache.org>
>> > | | Date:   Sat Jun 7 15:09:10 2014 -0700
>> > | |
>> > | |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
>> > | |
>> > * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
>> > |/  Author: pferrel <pa...@occamsmachete.com>
>> > |   Date:   Sat Jun 7 13:36:12 2014 -0700
>> > |
>> > |       added .DS_Store to gitignore for pushes from mac
>> > |
>> > * commit 63b765abb305cca6d726f54549a92018754a6348
>> > * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
>> > | Author: pferrel <pa...@occamsmachete.com>
>> > | Date:   Thu Jun 12 17:45:09 2014 -0700
>> > |
>> > |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
>> > apache/mahout#12
>> > |
>> > *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
>> > |\  Merge: fd7a0bf a8e09cd
>> > | | Author: pferrel <pa...@occamsmachete.com>
>> > | | Date:   Thu Jun 12 11:33:55 2014 -0700
>> > | |
>> > | |     Merge branch 'master' of
>> > https://git-wip-us.apache.org/repos/asf/mahout
>> > | |
>> > | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
>> > | | Author: ssc <ss...@apache.org>
>> > | | Date:   Thu Jun 12 19:03:19 2014 +0200
>> > | |
>> > | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
>> > apache/mahout#16
>> > | |
>> > * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
>> > |\ \  Merge: d319b32 b044a07
>> > | |/  Author: pferrel <pa...@occamsmachete.com>
>> > | |   Date:   Wed Jun 11 19:17:59 2014 -0700
>> > | |
>> > | |       Merge branch 'master' of
>> > https://git-wip-us.apache.org/repos/asf/mahout
>> > | |
>> > | * commit b044a07797a8fef23d10f10126615c9b7db659bb
>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | | Date:   Tue Jun 10 11:46:32 2014 -0700
>> > | |
>> > | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
>> > | |
>> > | |     This closes apache/mahout#15
>> > | |
>> > | |     Squashed commit of the following:
>> > | |
>> > | |     commit 0407577bff365028ceef9798d5835f12a81bc941
>> > | |     Author: Anand Avati <av...@redhat.com>
>> > | |     Date:   Mon Jun 9 22:05:14 2014 -0700
>> > | |
>> > | |         MAHOUT-1529: spark-shell - cleanup sdc
>> > | |
>> > | |         Renaming @sc to @sdc has left open the shutdown part. Spark
>> > | |         depends on 'implicit sc' to be set by the shell invoker.
>> > | |
>> > | |           mahout> Stopping spark context.
>> > | |           <console>:29: error: not found: value sc
>> > | |                         sc.stop()
>> > | |                         ^
>> > | |
>> > | |         So override sparkCleanUp() and call @sdc.stop()
>> > | |
>> > | |         Signed-off-by: Anand Avati <av...@redhat.com>
>> > | |
>> > | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | | Date:   Tue Jun 10 11:30:55 2014 -0700
>> > | |
>> > | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
>> > the loaded data
>> > | |
>> > | |     This closes apache/mahout#10
>> > | |
>> > | |     Squashed commit of the following:
>> > | |
>> > | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | |     Date:   Tue Jun 10 11:27:38 2014 -0700
>> > | |
>> > | |         + tests
>> > | |
>> > | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
>> > | |     Merge: 162c5ca 907781b
>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | |     Date:   Tue Jun 10 11:04:51 2014 -0700
>> > | |
>> > | |         Merge branch 'master' into MAHOUT-1572
>> > | |
>> > | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | |     Date:   Wed Jun 4 15:10:11 2014 -0700
>> > | |
>> > | |         initial fix (?)
>> > | |
>> > | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | | Date:   Tue Jun 10 10:48:55 2014 -0700
>> > | |
>> > | |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
>> > correctly
>> > | |
>> > | |     This closes apache/mahout#9
>> > | |
>> > | |     Squashed commit of the following:
>> > | |
>> > | |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | |     Date:   Tue Jun 10 10:46:17 2014 -0700
>> > | |
>> > | |         Adding test
>> > | |
>> > | |     commit ef271380e16192b55c31c7b219195d6982587206
>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | |     Date:   Wed Jun 4 14:43:24 2014 -0700
>> > | |
>> > | |         initial fix (?)
>> > | |
>> > | * commit 11046fb5273b559298111b201470d80cd6af43d9
>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | | Date:   Mon Jun 9 12:17:00 2014 -0700
>> > | |
>> > | |     NOJIRA: switching AlS to mahout's random from scala random to
>> > ensure deterministic test for the time being.
>> > | |
>> > * |   commit d319b325066620a82d079379564188912e8b0b92
>> > |\ \  Merge: a12135b fcb436d
>> > | |/  Author: pferrel <pa...@occamsmachete.com>
>> > | |   Date:   Mon Jun 9 07:01:15 2014 -0700
>> > | |
>> > | |       Merge branch 'master' of
>> > https://git-wip-us.apache.org/repos/asf/mahout
>> > | |
>> > | * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
>> > | | Author: Ted Dunning <td...@apache.org>
>> > | | Date:   Sun Jun 8 21:18:09 2014 -0700
>> > | |
>> > | |     MAHOUT-1577 - Restore visibility for getYtransposeY
>> > | |
>> > | * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
>> > | | Author: Ted Dunning <td...@apache.org>
>> > | | Date:   Sun Jun 8 20:57:37 2014 -0700
>> > | |
>> > | |     MAHOUT-1577 - Kill a few more warnings and turn off several
>> (like
>> > newline in format string, non-final method call in constructor)
>> > | |
>> > | * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
>> > | | Author: Ted Dunning <td...@apache.org>
>> > | | Date:   Sun Jun 8 18:24:48 2014 -0700
>> > | |
>> > | |     MAHOUT-1576 - Fix several low hanging warnings, the most
>> important
>> > have to do with over-ridable operations in a constructor
>> > | |
>> > * |   commit a12135b94002367046ef6edc977527d586026689
>> > |\ \  Merge: cc9a70e 99fd9ba
>> > | |/  Author: pferrel <pa...@occamsmachete.com>
>> > | |   Date:   Sun Jun 8 08:25:36 2014 -0700
>> > | |
>> > | |       Merge branch 'master' of
>> > https://git-wip-us.apache.org/repos/asf/mahout
>> > | |
>> > | * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
>> > | | Author: Ted Dunning <td...@apache.org>
>> > | | Date:   Sat Jun 7 15:09:10 2014 -0700
>> > | |
>> > | |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
>> > | |
>> > * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
>> > |/  Author: pferrel <pa...@occamsmachete.com>
>> > |   Date:   Sat Jun 7 13:36:12 2014 -0700
>> > |
>> > |       added .DS_Store to gitignore for pushes from mac
>> > |
>> > * commit 63b765abb305cca6d726f54549a92018754a6348
>> > * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
>> > | Author: pferrel <pa...@occamsmachete.com>
>> > | Date:   Thu Jun 12 17:45:09 2014 -0700
>> > |
>> > |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
>> > apache/mahout#12
>> > |
>> > *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
>> > |\  Merge: fd7a0bf a8e09cd
>> > | | Author: pferrel <pa...@occamsmachete.com>
>> > | | Date:   Thu Jun 12 11:33:55 2014 -0700
>> > | |
>> > | |     Merge branch 'master' of
>> > https://git-wip-us.apache.org/repos/asf/mahout
>> > | |
>> > | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
>> > | | Author: ssc <ss...@apache.org>
>> > | | Date:   Thu Jun 12 19:03:19 2014 +0200
>> > | |
>> > | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
>> > apache/mahout#16
>> > | |
>> > * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
>> > |\ \  Merge: d319b32 b044a07
>> > | |/  Author: pferrel <pa...@occamsmachete.com>
>> > | |   Date:   Wed Jun 11 19:17:59 2014 -0700
>> > | |
>> > | |       Merge branch 'master' of
>> > https://git-wip-us.apache.org/repos/asf/mahout
>> > | |
>> > | * commit b044a07797a8fef23d10f10126615c9b7db659bb
>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | | Date:   Tue Jun 10 11:46:32 2014 -0700
>> > | |
>> > | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
>> > | |
>> > | |     This closes apache/mahout#15
>> > | |
>> > | |     Squashed commit of the following:
>> > | |
>> > | |     commit 0407577bff365028ceef9798d5835f12a81bc941
>> > | |     Author: Anand Avati <av...@redhat.com>
>> > | |     Date:   Mon Jun 9 22:05:14 2014 -0700
>> > | |
>> > | |         MAHOUT-1529: spark-shell - cleanup sdc
>> > | |
>> > | |         Renaming @sc to @sdc has left open the shutdown part. Spark
>> > | |         depends on 'implicit sc' to be set by the shell invoker.
>> > | |
>> > | |           mahout> Stopping spark context.
>> > | |           <console>:29: error: not found: value sc
>> > | |                         sc.stop()
>> > | |                         ^
>> > | |
>> > | |         So override sparkCleanUp() and call @sdc.stop()
>> > | |
>> > | |         Signed-off-by: Anand Avati <av...@redhat.com>
>> > | |
>> > | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | | Date:   Tue Jun 10 11:30:55 2014 -0700
>> > | |
>> > | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
>> > the loaded data
>> > | |
>> > | |     This closes apache/mahout#10
>> > | |
>> > | |     Squashed commit of the following:
>> > | |
>> > | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | |     Date:   Tue Jun 10 11:27:38 2014 -0700
>> > | |
>> > | |         + tests
>> > | |
>> > | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
>> > | |     Merge: 162c5ca 907781b
>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | |     Date:   Tue Jun 10 11:04:51 2014 -0700
>> > | |
>> > | |         Merge branch 'master' into MAHOUT-1572
>> > | |
>> > | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | |     Date:   Wed Jun 4 15:10:11 2014 -0700
>> > | |
>> > | |         initial fix (?)
>> > | |
>> > | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | | Date:   Tue Jun 10 10:48:55 2014 -0700
>> > | |
>> > | |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
>> > correctly
>> > | |
>> > | |     This closes apache/mahout#9
>> > | |
>> > | |     Squashed commit of the following:
>> > | |
>> > | |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | |     Date:   Tue Jun 10 10:46:17 2014 -0700
>> > | |
>> > | |         Adding test
>> > | |
>> > | |     commit ef271380e16192b55c31c7b219195d6982587206
>> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | |     Date:   Wed Jun 4 14:43:24 2014 -0700
>> > | |
>> > | |         initial fix (?)
>> > | |
>> > | * commit 11046fb5273b559298111b201470d80cd6af43d9
>> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
>> > | | Date:   Mon Jun 9 12:17:00 2014 -0700
>> > | |
>> > | |     NOJIRA: switching AlS to mahout's random from scala random to
>> > ensure deterministic test for the time being.
>> > | |
>> > * |   commit d319b325066620a82d079379564188912e8b0b92
>> > |\ \  Merge: a12135b fcb436d
>> > | |/  Author: pferrel <pa...@occamsmachete.com>
>> > | |   Date:   Mon Jun 9 07:01:15 2014 -0700
>> > | |
>> > | |       Merge branch 'master' of
>> > https://git-wip-us.apache.org/repos/asf/mahout
>> > | |
>> > | * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
>> > | | Author: Ted Dunning <td...@apache.org>
>> > | | Date:   Sun Jun 8 21:18:09 2014 -0700
>> > | |
>> > | |     MAHOUT-1577 - Restore visibility for getYtransposeY
>> > | |
>> > | * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
>> > | | Author: Ted Dunning <td...@apache.org>
>> > | | Date:   Sun Jun 8 20:57:37 2014 -0700
>> > | |
>> > | |     MAHOUT-1577 - Kill a few more warnings and turn off several
>> (like
>> > newline in format string, non-final method call in constructor)
>> > | |
>> > | * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
>> > | | Author: Ted Dunning <td...@apache.org>
>> > | | Date:   Sun Jun 8 18:24:48 2014 -0700
>> > | |
>> > | |     MAHOUT-1576 - Fix several low hanging warnings, the most
>> important
>> > have to do with over-ridable operations in a constructor
>> > | |
>> > * |   commit a12135b94002367046ef6edc977527d586026689
>> > |\ \  Merge: cc9a70e 99fd9ba
>> > | |/  Author: pferrel <pa...@occamsmachete.com>
>> > | |   Date:   Sun Jun 8 08:25:36 2014 -0700
>> > | |
>> > | |       Merge branch 'master' of
>> > https://git-wip-us.apache.org/repos/asf/mahout
>> > | |
>> > | * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
>> > | | Author: Ted Dunning <td...@apache.org>
>> > | | Date:   Sat Jun 7 15:09:10 2014 -0700
>> > | |
>> > | |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
>> > | |
>> > * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
>> > |/  Author: pferrel <pa...@occamsmachete.com>
>> > |   Date:   Sat Jun 7 13:36:12 2014 -0700
>> > |
>> >
>> >
>>
>>
>

Re: master branch history and Git commits - please DO squash your working branches before merging in

Posted by Dmitriy Lyubimov <dl...@gmail.com>.
it is the same history that i printed, in chronological order and not
showing graph of it. No contradiction here whatsoever. Github is not shoing
the entire graph (try git log --graph --date-order to see true succession
graph structure. You want to see one single line of succession, not the
weaving patterns of multiple succession paths and merges).




On Fri, Jun 13, 2014 at 12:35 PM, Pat Ferrel <pa...@gmail.com> wrote:

> It doesn’t show all the commit messages by any means. Look
> https://github.com/apache/mahout/commits/master?page=1
>
> It shows 6 commit messages, all but 2 are times when I merged master into
> my branch (never pushed those to the apache master so I bet these are
> exceptions to squash). One is the commit before pushing. So all of those
> seem ok.
>
> The weird one is a change to .gitignore ???, which I have no explanation
> for.
>
> You looking somewhere else?
>
> On Jun 13, 2014, at 11:38 AM, Dmitriy Lyubimov <dl...@gmail.com> wrote:
>
> the recipe seems ok but obviously something wrong did happen since we still
> see your history in master.
>
> I'd suggest to check the history explicitly before pushing if unsure.
>
> ASF hooks prevent repairing history (as in rewriting history), and for a
> good reason since one got to be even more accurate while doing that than
> during simple squash merge, so we cannot undo it now and i guess we'd have
> to do what we do a bit more reverently when it comes to pushing to master.
>
> -d
>
>
> On Fri, Jun 13, 2014 at 11:30 AM, Pat Ferrel <pa...@gmail.com> wrote:
>
> > I did a:
> >
> > git checkout master
> > git merge --squash mahout-1464
> >
> > did my build, tests, updated changelog then
> >
> > git commit -a -m “yada yada close PR message"
> > git push apache master
> >
> > something wrong there?
> >
> > On Jun 13, 2014, at 11:05 AM, Dmitriy Lyubimov <dl...@gmail.com>
> wrote:
> >
> > Hi,
> >
> > I would like to suggest to prohibit merges and intermediate commits in
> the
> > master branch. Please   --squash history from the working branch (as
> > defined in PR merge page)!
> >
> > Not squashing working branch history  makes it difficult to (1) attribute
> > intermediate commits to a Mahout issue as not all intermediate commit
> > messages clearly state so; and (2) be able to correct history if needed,
> > with rollbacks.
> >
> > (I do list working branch history in commit description; or, rather, git
> > does it automatically for me, but they are not commits in the master).
> >
> > Bottom line, it is a mess (Pat, i am winking at you :)
> >
> > * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
> > | Author: pferrel <pa...@occamsmachete.com>
> > | Date:   Thu Jun 12 17:45:09 2014 -0700
> > |
> > |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
> > apache/mahout#12
> > |
> > *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
> > |\  Merge: fd7a0bf a8e09cd
> > | | Author: pferrel <pa...@occamsmachete.com>
> > | | Date:   Thu Jun 12 11:33:55 2014 -0700
> > | |
> > | |     Merge branch 'master' of
> > https://git-wip-us.apache.org/repos/asf/mahout
> > | |
> > | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
> > | | Author: ssc <ss...@apache.org>
> > | | Date:   Thu Jun 12 19:03:19 2014 +0200
> > | |
> > | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
> > apache/mahout#16
> > | |
> > * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
> > |\ \  Merge: d319b32 b044a07
> > | |/  Author: pferrel <pa...@occamsmachete.com>
> > | |   Date:   Wed Jun 11 19:17:59 2014 -0700
> > | |
> > | |       Merge branch 'master' of
> > https://git-wip-us.apache.org/repos/asf/mahout
> > | |
> > | * commit b044a07797a8fef23d10f10126615c9b7db659bb
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Tue Jun 10 11:46:32 2014 -0700
> > | |
> > | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
> > | |
> > | |     This closes apache/mahout#15
> > | |
> > | |     Squashed commit of the following:
> > | |
> > | |     commit 0407577bff365028ceef9798d5835f12a81bc941
> > | |     Author: Anand Avati <av...@redhat.com>
> > | |     Date:   Mon Jun 9 22:05:14 2014 -0700
> > | |
> > | |         MAHOUT-1529: spark-shell - cleanup sdc
> > | |
> > | |         Renaming @sc to @sdc has left open the shutdown part. Spark
> > | |         depends on 'implicit sc' to be set by the shell invoker.
> > | |
> > | |           mahout> Stopping spark context.
> > | |           <console>:29: error: not found: value sc
> > | |                         sc.stop()
> > | |                         ^
> > | |
> > | |         So override sparkCleanUp() and call @sdc.stop()
> > | |
> > | |         Signed-off-by: Anand Avati <av...@redhat.com>
> > | |
> > | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Tue Jun 10 11:30:55 2014 -0700
> > | |
> > | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
> > the loaded data
> > | |
> > | |     This closes apache/mahout#10
> > | |
> > | |     Squashed commit of the following:
> > | |
> > | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Tue Jun 10 11:27:38 2014 -0700
> > | |
> > | |         + tests
> > | |
> > | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
> > | |     Merge: 162c5ca 907781b
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Tue Jun 10 11:04:51 2014 -0700
> > | |
> > | |         Merge branch 'master' into MAHOUT-1572
> > | |
> > | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Wed Jun 4 15:10:11 2014 -0700
> > | |
> > | |         initial fix (?)
> > | |
> > | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Tue Jun 10 10:48:55 2014 -0700
> > | |
> > | |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
> > correctly
> > | |
> > | |     This closes apache/mahout#9
> > * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
> > | Author: pferrel <pa...@occamsmachete.com>
> > | Date:   Thu Jun 12 17:45:09 2014 -0700
> > |
> > |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
> > apache/mahout#12
> > |
> > *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
> > |\  Merge: fd7a0bf a8e09cd
> > | | Author: pferrel <pa...@occamsmachete.com>
> > | | Date:   Thu Jun 12 11:33:55 2014 -0700
> > | |
> > | |     Merge branch 'master' of
> > https://git-wip-us.apache.org/repos/asf/mahout
> > | |
> > | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
> > | | Author: ssc <ss...@apache.org>
> > | | Date:   Thu Jun 12 19:03:19 2014 +0200
> > | |
> > | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
> > apache/mahout#16
> > | |
> > * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
> > |\ \  Merge: d319b32 b044a07
> > | |/  Author: pferrel <pa...@occamsmachete.com>
> > | |   Date:   Wed Jun 11 19:17:59 2014 -0700
> > | |
> > | |       Merge branch 'master' of
> > https://git-wip-us.apache.org/repos/asf/mahout
> > | |
> > | * commit b044a07797a8fef23d10f10126615c9b7db659bb
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Tue Jun 10 11:46:32 2014 -0700
> > | |
> > | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
> > | |
> > | |     This closes apache/mahout#15
> > | |
> > | |     Squashed commit of the following:
> > | |
> > | |     commit 0407577bff365028ceef9798d5835f12a81bc941
> > | |     Author: Anand Avati <av...@redhat.com>
> > | |     Date:   Mon Jun 9 22:05:14 2014 -0700
> > | |
> > | |         MAHOUT-1529: spark-shell - cleanup sdc
> > | |
> > | |         Renaming @sc to @sdc has left open the shutdown part. Spark
> > | |         depends on 'implicit sc' to be set by the shell invoker.
> > | |
> > | |           mahout> Stopping spark context.
> > | |           <console>:29: error: not found: value sc
> > | |                         sc.stop()
> > | |                         ^
> > | |
> > | |         So override sparkCleanUp() and call @sdc.stop()
> > | |
> > | |         Signed-off-by: Anand Avati <av...@redhat.com>
> > | |
> > | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Tue Jun 10 11:30:55 2014 -0700
> > | |
> > | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
> > the loaded data
> > | |
> > | |     This closes apache/mahout#10
> > | |
> > | |     Squashed commit of the following:
> > | |
> > | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Tue Jun 10 11:27:38 2014 -0700
> > | |
> > | |         + tests
> > | |
> > | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
> > | |     Merge: 162c5ca 907781b
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Tue Jun 10 11:04:51 2014 -0700
> > | |
> > | |         Merge branch 'master' into MAHOUT-1572
> > | |
> > | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Wed Jun 4 15:10:11 2014 -0700
> > | |
> > | |         initial fix (?)
> > | |
> > | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Tue Jun 10 10:48:55 2014 -0700
> > | |
> > | |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
> > correctly
> > | |
> > | |     This closes apache/mahout#9
> > | |
> > | |     Squashed commit of the following:
> > | |
> > | |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Tue Jun 10 10:46:17 2014 -0700
> > | |
> > | |         Adding test
> > | |
> > | |     commit ef271380e16192b55c31c7b219195d6982587206
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Wed Jun 4 14:43:24 2014 -0700
> > | |
> > | |         initial fix (?)
> > | |
> > | * commit 11046fb5273b559298111b201470d80cd6af43d9
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Mon Jun 9 12:17:00 2014 -0700
> > | |
> > | |     NOJIRA: switching AlS to mahout's random from scala random to
> > ensure deterministic test for the time being.
> > | |
> > * |   commit d319b325066620a82d079379564188912e8b0b92
> > |\ \  Merge: a12135b fcb436d
> > | |/  Author: pferrel <pa...@occamsmachete.com>
> > | |   Date:   Mon Jun 9 07:01:15 2014 -0700
> > | |
> > | |       Merge branch 'master' of
> > https://git-wip-us.apache.org/repos/asf/mahout
> > | |
> > | * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
> > | | Author: Ted Dunning <td...@apache.org>
> > | | Date:   Sun Jun 8 21:18:09 2014 -0700
> > | |
> > | |     MAHOUT-1577 - Restore visibility for getYtransposeY
> > | |
> > | * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
> > | | Author: Ted Dunning <td...@apache.org>
> > | | Date:   Sun Jun 8 20:57:37 2014 -0700
> > | |
> > | |     MAHOUT-1577 - Kill a few more warnings and turn off several (like
> > newline in format string, non-final method call in constructor)
> > | |
> > | * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
> > | | Author: Ted Dunning <td...@apache.org>
> > | | Date:   Sun Jun 8 18:24:48 2014 -0700
> > | |
> > | |     MAHOUT-1576 - Fix several low hanging warnings, the most
> important
> > have to do with over-ridable operations in a constructor
> > | |
> > * |   commit a12135b94002367046ef6edc977527d586026689
> > |\ \  Merge: cc9a70e 99fd9ba
> > | |/  Author: pferrel <pa...@occamsmachete.com>
> > | |   Date:   Sun Jun 8 08:25:36 2014 -0700
> > | |
> > | |       Merge branch 'master' of
> > https://git-wip-us.apache.org/repos/asf/mahout
> > | |
> > | * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
> > | | Author: Ted Dunning <td...@apache.org>
> > | | Date:   Sat Jun 7 15:09:10 2014 -0700
> > | |
> > | |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
> > | |
> > * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
> > |/  Author: pferrel <pa...@occamsmachete.com>
> > |   Date:   Sat Jun 7 13:36:12 2014 -0700
> > |
> > |       added .DS_Store to gitignore for pushes from mac
> > |
> > * commit 63b765abb305cca6d726f54549a92018754a6348
> > * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
> > | Author: pferrel <pa...@occamsmachete.com>
> > | Date:   Thu Jun 12 17:45:09 2014 -0700
> > |
> > |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
> > apache/mahout#12
> > |
> > *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
> > |\  Merge: fd7a0bf a8e09cd
> > | | Author: pferrel <pa...@occamsmachete.com>
> > | | Date:   Thu Jun 12 11:33:55 2014 -0700
> > | |
> > | |     Merge branch 'master' of
> > https://git-wip-us.apache.org/repos/asf/mahout
> > | |
> > | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
> > | | Author: ssc <ss...@apache.org>
> > | | Date:   Thu Jun 12 19:03:19 2014 +0200
> > | |
> > | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
> > apache/mahout#16
> > | |
> > * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
> > |\ \  Merge: d319b32 b044a07
> > | |/  Author: pferrel <pa...@occamsmachete.com>
> > | |   Date:   Wed Jun 11 19:17:59 2014 -0700
> > | |
> > | |       Merge branch 'master' of
> > https://git-wip-us.apache.org/repos/asf/mahout
> > | |
> > | * commit b044a07797a8fef23d10f10126615c9b7db659bb
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Tue Jun 10 11:46:32 2014 -0700
> > | |
> > | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
> > | |
> > | |     This closes apache/mahout#15
> > | |
> > | |     Squashed commit of the following:
> > | |
> > | |     commit 0407577bff365028ceef9798d5835f12a81bc941
> > | |     Author: Anand Avati <av...@redhat.com>
> > | |     Date:   Mon Jun 9 22:05:14 2014 -0700
> > | |
> > | |         MAHOUT-1529: spark-shell - cleanup sdc
> > | |
> > | |         Renaming @sc to @sdc has left open the shutdown part. Spark
> > | |         depends on 'implicit sc' to be set by the shell invoker.
> > | |
> > | |           mahout> Stopping spark context.
> > | |           <console>:29: error: not found: value sc
> > | |                         sc.stop()
> > | |                         ^
> > | |
> > | |         So override sparkCleanUp() and call @sdc.stop()
> > | |
> > | |         Signed-off-by: Anand Avati <av...@redhat.com>
> > | |
> > | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Tue Jun 10 11:30:55 2014 -0700
> > | |
> > | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
> > the loaded data
> > | |
> > | |     This closes apache/mahout#10
> > | |
> > | |     Squashed commit of the following:
> > | |
> > | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Tue Jun 10 11:27:38 2014 -0700
> > | |
> > | |         + tests
> > | |
> > | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
> > | |     Merge: 162c5ca 907781b
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Tue Jun 10 11:04:51 2014 -0700
> > | |
> > | |         Merge branch 'master' into MAHOUT-1572
> > | |
> > | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Wed Jun 4 15:10:11 2014 -0700
> > | |
> > | |         initial fix (?)
> > | |
> > | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Tue Jun 10 10:48:55 2014 -0700
> > | |
> > | |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
> > correctly
> > | |
> > | |     This closes apache/mahout#9
> > | |
> > | |     Squashed commit of the following:
> > | |
> > | |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Tue Jun 10 10:46:17 2014 -0700
> > | |
> > | |         Adding test
> > | |
> > | |     commit ef271380e16192b55c31c7b219195d6982587206
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Wed Jun 4 14:43:24 2014 -0700
> > | |
> > | |         initial fix (?)
> > | |
> > | * commit 11046fb5273b559298111b201470d80cd6af43d9
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Mon Jun 9 12:17:00 2014 -0700
> > | |
> > | |     NOJIRA: switching AlS to mahout's random from scala random to
> > ensure deterministic test for the time being.
> > | |
> > * |   commit d319b325066620a82d079379564188912e8b0b92
> > |\ \  Merge: a12135b fcb436d
> > | |/  Author: pferrel <pa...@occamsmachete.com>
> > | |   Date:   Mon Jun 9 07:01:15 2014 -0700
> > | |
> > | |       Merge branch 'master' of
> > https://git-wip-us.apache.org/repos/asf/mahout
> > | |
> > | * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
> > | | Author: Ted Dunning <td...@apache.org>
> > | | Date:   Sun Jun 8 21:18:09 2014 -0700
> > | |
> > | |     MAHOUT-1577 - Restore visibility for getYtransposeY
> > | |
> > | * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
> > | | Author: Ted Dunning <td...@apache.org>
> > | | Date:   Sun Jun 8 20:57:37 2014 -0700
> > | |
> > | |     MAHOUT-1577 - Kill a few more warnings and turn off several (like
> > newline in format string, non-final method call in constructor)
> > | |
> > | * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
> > | | Author: Ted Dunning <td...@apache.org>
> > | | Date:   Sun Jun 8 18:24:48 2014 -0700
> > | |
> > | |     MAHOUT-1576 - Fix several low hanging warnings, the most
> important
> > have to do with over-ridable operations in a constructor
> > | |
> > * |   commit a12135b94002367046ef6edc977527d586026689
> > |\ \  Merge: cc9a70e 99fd9ba
> > | |/  Author: pferrel <pa...@occamsmachete.com>
> > | |   Date:   Sun Jun 8 08:25:36 2014 -0700
> > | |
> > | |       Merge branch 'master' of
> > https://git-wip-us.apache.org/repos/asf/mahout
> > | |
> > | * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
> > | | Author: Ted Dunning <td...@apache.org>
> > | | Date:   Sat Jun 7 15:09:10 2014 -0700
> > | |
> > | |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
> > | |
> > * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
> > |/  Author: pferrel <pa...@occamsmachete.com>
> > |   Date:   Sat Jun 7 13:36:12 2014 -0700
> > |
> > |       added .DS_Store to gitignore for pushes from mac
> > |
> > * commit 63b765abb305cca6d726f54549a92018754a6348
> > * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
> > | Author: pferrel <pa...@occamsmachete.com>
> > | Date:   Thu Jun 12 17:45:09 2014 -0700
> > |
> > |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
> > apache/mahout#12
> > |
> > *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
> > |\  Merge: fd7a0bf a8e09cd
> > | | Author: pferrel <pa...@occamsmachete.com>
> > | | Date:   Thu Jun 12 11:33:55 2014 -0700
> > | |
> > | |     Merge branch 'master' of
> > https://git-wip-us.apache.org/repos/asf/mahout
> > | |
> > | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
> > | | Author: ssc <ss...@apache.org>
> > | | Date:   Thu Jun 12 19:03:19 2014 +0200
> > | |
> > | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
> > apache/mahout#16
> > | |
> > * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
> > |\ \  Merge: d319b32 b044a07
> > | |/  Author: pferrel <pa...@occamsmachete.com>
> > | |   Date:   Wed Jun 11 19:17:59 2014 -0700
> > | |
> > | |       Merge branch 'master' of
> > https://git-wip-us.apache.org/repos/asf/mahout
> > | |
> > | * commit b044a07797a8fef23d10f10126615c9b7db659bb
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Tue Jun 10 11:46:32 2014 -0700
> > | |
> > | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
> > | |
> > | |     This closes apache/mahout#15
> > | |
> > | |     Squashed commit of the following:
> > | |
> > | |     commit 0407577bff365028ceef9798d5835f12a81bc941
> > | |     Author: Anand Avati <av...@redhat.com>
> > | |     Date:   Mon Jun 9 22:05:14 2014 -0700
> > | |
> > | |         MAHOUT-1529: spark-shell - cleanup sdc
> > | |
> > | |         Renaming @sc to @sdc has left open the shutdown part. Spark
> > | |         depends on 'implicit sc' to be set by the shell invoker.
> > | |
> > | |           mahout> Stopping spark context.
> > | |           <console>:29: error: not found: value sc
> > | |                         sc.stop()
> > | |                         ^
> > | |
> > | |         So override sparkCleanUp() and call @sdc.stop()
> > | |
> > | |         Signed-off-by: Anand Avati <av...@redhat.com>
> > | |
> > | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Tue Jun 10 11:30:55 2014 -0700
> > | |
> > | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
> > the loaded data
> > | |
> > | |     This closes apache/mahout#10
> > | |
> > | |     Squashed commit of the following:
> > | |
> > | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Tue Jun 10 11:27:38 2014 -0700
> > | |
> > | |         + tests
> > | |
> > | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
> > | |     Merge: 162c5ca 907781b
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Tue Jun 10 11:04:51 2014 -0700
> > | |
> > | |         Merge branch 'master' into MAHOUT-1572
> > | |
> > | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Wed Jun 4 15:10:11 2014 -0700
> > | |
> > | |         initial fix (?)
> > | |
> > | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Tue Jun 10 10:48:55 2014 -0700
> > | |
> > | |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
> > correctly
> > | |
> > | |     This closes apache/mahout#9
> > | |
> > | |     Squashed commit of the following:
> > | |
> > | |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Tue Jun 10 10:46:17 2014 -0700
> > | |
> > | |         Adding test
> > | |
> > | |     commit ef271380e16192b55c31c7b219195d6982587206
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Wed Jun 4 14:43:24 2014 -0700
> > | |
> > | |         initial fix (?)
> > | |
> > | * commit 11046fb5273b559298111b201470d80cd6af43d9
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Mon Jun 9 12:17:00 2014 -0700
> > | |
> > | |     NOJIRA: switching AlS to mahout's random from scala random to
> > ensure deterministic test for the time being.
> > | |
> > * |   commit d319b325066620a82d079379564188912e8b0b92
> > |\ \  Merge: a12135b fcb436d
> > | |/  Author: pferrel <pa...@occamsmachete.com>
> > | |   Date:   Mon Jun 9 07:01:15 2014 -0700
> > | |
> > | |       Merge branch 'master' of
> > https://git-wip-us.apache.org/repos/asf/mahout
> > | |
> > | * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
> > | | Author: Ted Dunning <td...@apache.org>
> > | | Date:   Sun Jun 8 21:18:09 2014 -0700
> > | |
> > | |     MAHOUT-1577 - Restore visibility for getYtransposeY
> > | |
> > | * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
> > | | Author: Ted Dunning <td...@apache.org>
> > | | Date:   Sun Jun 8 20:57:37 2014 -0700
> > | |
> > | |     MAHOUT-1577 - Kill a few more warnings and turn off several (like
> > newline in format string, non-final method call in constructor)
> > | |
> > | * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
> > | | Author: Ted Dunning <td...@apache.org>
> > | | Date:   Sun Jun 8 18:24:48 2014 -0700
> > | |
> > | |     MAHOUT-1576 - Fix several low hanging warnings, the most
> important
> > have to do with over-ridable operations in a constructor
> > | |
> > * |   commit a12135b94002367046ef6edc977527d586026689
> > |\ \  Merge: cc9a70e 99fd9ba
> > | |/  Author: pferrel <pa...@occamsmachete.com>
> > | |   Date:   Sun Jun 8 08:25:36 2014 -0700
> > | |
> > | |       Merge branch 'master' of
> > https://git-wip-us.apache.org/repos/asf/mahout
> > | |
> > | * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
> > | | Author: Ted Dunning <td...@apache.org>
> > | | Date:   Sat Jun 7 15:09:10 2014 -0700
> > | |
> > | |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
> > | |
> > * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
> > |/  Author: pferrel <pa...@occamsmachete.com>
> > |   Date:   Sat Jun 7 13:36:12 2014 -0700
> > |
> >
> >
>
>

Re: master branch history and Git commits - please DO squash your working branches before merging in

Posted by Pat Ferrel <pa...@gmail.com>.
It doesn’t show all the commit messages by any means. Look https://github.com/apache/mahout/commits/master?page=1

It shows 6 commit messages, all but 2 are times when I merged master into my branch (never pushed those to the apache master so I bet these are exceptions to squash). One is the commit before pushing. So all of those seem ok.

The weird one is a change to .gitignore ???, which I have no explanation for.

You looking somewhere else? 

On Jun 13, 2014, at 11:38 AM, Dmitriy Lyubimov <dl...@gmail.com> wrote:

the recipe seems ok but obviously something wrong did happen since we still
see your history in master.

I'd suggest to check the history explicitly before pushing if unsure.

ASF hooks prevent repairing history (as in rewriting history), and for a
good reason since one got to be even more accurate while doing that than
during simple squash merge, so we cannot undo it now and i guess we'd have
to do what we do a bit more reverently when it comes to pushing to master.

-d


On Fri, Jun 13, 2014 at 11:30 AM, Pat Ferrel <pa...@gmail.com> wrote:

> I did a:
> 
> git checkout master
> git merge --squash mahout-1464
> 
> did my build, tests, updated changelog then
> 
> git commit -a -m “yada yada close PR message"
> git push apache master
> 
> something wrong there?
> 
> On Jun 13, 2014, at 11:05 AM, Dmitriy Lyubimov <dl...@gmail.com> wrote:
> 
> Hi,
> 
> I would like to suggest to prohibit merges and intermediate commits in the
> master branch. Please   --squash history from the working branch (as
> defined in PR merge page)!
> 
> Not squashing working branch history  makes it difficult to (1) attribute
> intermediate commits to a Mahout issue as not all intermediate commit
> messages clearly state so; and (2) be able to correct history if needed,
> with rollbacks.
> 
> (I do list working branch history in commit description; or, rather, git
> does it automatically for me, but they are not commits in the master).
> 
> Bottom line, it is a mess (Pat, i am winking at you :)
> 
> * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
> | Author: pferrel <pa...@occamsmachete.com>
> | Date:   Thu Jun 12 17:45:09 2014 -0700
> |
> |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
> apache/mahout#12
> |
> *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
> |\  Merge: fd7a0bf a8e09cd
> | | Author: pferrel <pa...@occamsmachete.com>
> | | Date:   Thu Jun 12 11:33:55 2014 -0700
> | |
> | |     Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
> | | Author: ssc <ss...@apache.org>
> | | Date:   Thu Jun 12 19:03:19 2014 +0200
> | |
> | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
> apache/mahout#16
> | |
> * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
> |\ \  Merge: d319b32 b044a07
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Wed Jun 11 19:17:59 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit b044a07797a8fef23d10f10126615c9b7db659bb
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 11:46:32 2014 -0700
> | |
> | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
> | |
> | |     This closes apache/mahout#15
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit 0407577bff365028ceef9798d5835f12a81bc941
> | |     Author: Anand Avati <av...@redhat.com>
> | |     Date:   Mon Jun 9 22:05:14 2014 -0700
> | |
> | |         MAHOUT-1529: spark-shell - cleanup sdc
> | |
> | |         Renaming @sc to @sdc has left open the shutdown part. Spark
> | |         depends on 'implicit sc' to be set by the shell invoker.
> | |
> | |           mahout> Stopping spark context.
> | |           <console>:29: error: not found: value sc
> | |                         sc.stop()
> | |                         ^
> | |
> | |         So override sparkCleanUp() and call @sdc.stop()
> | |
> | |         Signed-off-by: Anand Avati <av...@redhat.com>
> | |
> | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 11:30:55 2014 -0700
> | |
> | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
> the loaded data
> | |
> | |     This closes apache/mahout#10
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 11:27:38 2014 -0700
> | |
> | |         + tests
> | |
> | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
> | |     Merge: 162c5ca 907781b
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 11:04:51 2014 -0700
> | |
> | |         Merge branch 'master' into MAHOUT-1572
> | |
> | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Wed Jun 4 15:10:11 2014 -0700
> | |
> | |         initial fix (?)
> | |
> | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 10:48:55 2014 -0700
> | |
> | |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
> correctly
> | |
> | |     This closes apache/mahout#9
> * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
> | Author: pferrel <pa...@occamsmachete.com>
> | Date:   Thu Jun 12 17:45:09 2014 -0700
> |
> |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
> apache/mahout#12
> |
> *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
> |\  Merge: fd7a0bf a8e09cd
> | | Author: pferrel <pa...@occamsmachete.com>
> | | Date:   Thu Jun 12 11:33:55 2014 -0700
> | |
> | |     Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
> | | Author: ssc <ss...@apache.org>
> | | Date:   Thu Jun 12 19:03:19 2014 +0200
> | |
> | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
> apache/mahout#16
> | |
> * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
> |\ \  Merge: d319b32 b044a07
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Wed Jun 11 19:17:59 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit b044a07797a8fef23d10f10126615c9b7db659bb
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 11:46:32 2014 -0700
> | |
> | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
> | |
> | |     This closes apache/mahout#15
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit 0407577bff365028ceef9798d5835f12a81bc941
> | |     Author: Anand Avati <av...@redhat.com>
> | |     Date:   Mon Jun 9 22:05:14 2014 -0700
> | |
> | |         MAHOUT-1529: spark-shell - cleanup sdc
> | |
> | |         Renaming @sc to @sdc has left open the shutdown part. Spark
> | |         depends on 'implicit sc' to be set by the shell invoker.
> | |
> | |           mahout> Stopping spark context.
> | |           <console>:29: error: not found: value sc
> | |                         sc.stop()
> | |                         ^
> | |
> | |         So override sparkCleanUp() and call @sdc.stop()
> | |
> | |         Signed-off-by: Anand Avati <av...@redhat.com>
> | |
> | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 11:30:55 2014 -0700
> | |
> | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
> the loaded data
> | |
> | |     This closes apache/mahout#10
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 11:27:38 2014 -0700
> | |
> | |         + tests
> | |
> | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
> | |     Merge: 162c5ca 907781b
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 11:04:51 2014 -0700
> | |
> | |         Merge branch 'master' into MAHOUT-1572
> | |
> | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Wed Jun 4 15:10:11 2014 -0700
> | |
> | |         initial fix (?)
> | |
> | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 10:48:55 2014 -0700
> | |
> | |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
> correctly
> | |
> | |     This closes apache/mahout#9
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 10:46:17 2014 -0700
> | |
> | |         Adding test
> | |
> | |     commit ef271380e16192b55c31c7b219195d6982587206
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Wed Jun 4 14:43:24 2014 -0700
> | |
> | |         initial fix (?)
> | |
> | * commit 11046fb5273b559298111b201470d80cd6af43d9
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Mon Jun 9 12:17:00 2014 -0700
> | |
> | |     NOJIRA: switching AlS to mahout's random from scala random to
> ensure deterministic test for the time being.
> | |
> * |   commit d319b325066620a82d079379564188912e8b0b92
> |\ \  Merge: a12135b fcb436d
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Mon Jun 9 07:01:15 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sun Jun 8 21:18:09 2014 -0700
> | |
> | |     MAHOUT-1577 - Restore visibility for getYtransposeY
> | |
> | * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sun Jun 8 20:57:37 2014 -0700
> | |
> | |     MAHOUT-1577 - Kill a few more warnings and turn off several (like
> newline in format string, non-final method call in constructor)
> | |
> | * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sun Jun 8 18:24:48 2014 -0700
> | |
> | |     MAHOUT-1576 - Fix several low hanging warnings, the most important
> have to do with over-ridable operations in a constructor
> | |
> * |   commit a12135b94002367046ef6edc977527d586026689
> |\ \  Merge: cc9a70e 99fd9ba
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Sun Jun 8 08:25:36 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sat Jun 7 15:09:10 2014 -0700
> | |
> | |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
> | |
> * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
> |/  Author: pferrel <pa...@occamsmachete.com>
> |   Date:   Sat Jun 7 13:36:12 2014 -0700
> |
> |       added .DS_Store to gitignore for pushes from mac
> |
> * commit 63b765abb305cca6d726f54549a92018754a6348
> * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
> | Author: pferrel <pa...@occamsmachete.com>
> | Date:   Thu Jun 12 17:45:09 2014 -0700
> |
> |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
> apache/mahout#12
> |
> *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
> |\  Merge: fd7a0bf a8e09cd
> | | Author: pferrel <pa...@occamsmachete.com>
> | | Date:   Thu Jun 12 11:33:55 2014 -0700
> | |
> | |     Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
> | | Author: ssc <ss...@apache.org>
> | | Date:   Thu Jun 12 19:03:19 2014 +0200
> | |
> | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
> apache/mahout#16
> | |
> * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
> |\ \  Merge: d319b32 b044a07
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Wed Jun 11 19:17:59 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit b044a07797a8fef23d10f10126615c9b7db659bb
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 11:46:32 2014 -0700
> | |
> | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
> | |
> | |     This closes apache/mahout#15
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit 0407577bff365028ceef9798d5835f12a81bc941
> | |     Author: Anand Avati <av...@redhat.com>
> | |     Date:   Mon Jun 9 22:05:14 2014 -0700
> | |
> | |         MAHOUT-1529: spark-shell - cleanup sdc
> | |
> | |         Renaming @sc to @sdc has left open the shutdown part. Spark
> | |         depends on 'implicit sc' to be set by the shell invoker.
> | |
> | |           mahout> Stopping spark context.
> | |           <console>:29: error: not found: value sc
> | |                         sc.stop()
> | |                         ^
> | |
> | |         So override sparkCleanUp() and call @sdc.stop()
> | |
> | |         Signed-off-by: Anand Avati <av...@redhat.com>
> | |
> | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 11:30:55 2014 -0700
> | |
> | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
> the loaded data
> | |
> | |     This closes apache/mahout#10
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 11:27:38 2014 -0700
> | |
> | |         + tests
> | |
> | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
> | |     Merge: 162c5ca 907781b
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 11:04:51 2014 -0700
> | |
> | |         Merge branch 'master' into MAHOUT-1572
> | |
> | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Wed Jun 4 15:10:11 2014 -0700
> | |
> | |         initial fix (?)
> | |
> | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 10:48:55 2014 -0700
> | |
> | |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
> correctly
> | |
> | |     This closes apache/mahout#9
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 10:46:17 2014 -0700
> | |
> | |         Adding test
> | |
> | |     commit ef271380e16192b55c31c7b219195d6982587206
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Wed Jun 4 14:43:24 2014 -0700
> | |
> | |         initial fix (?)
> | |
> | * commit 11046fb5273b559298111b201470d80cd6af43d9
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Mon Jun 9 12:17:00 2014 -0700
> | |
> | |     NOJIRA: switching AlS to mahout's random from scala random to
> ensure deterministic test for the time being.
> | |
> * |   commit d319b325066620a82d079379564188912e8b0b92
> |\ \  Merge: a12135b fcb436d
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Mon Jun 9 07:01:15 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sun Jun 8 21:18:09 2014 -0700
> | |
> | |     MAHOUT-1577 - Restore visibility for getYtransposeY
> | |
> | * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sun Jun 8 20:57:37 2014 -0700
> | |
> | |     MAHOUT-1577 - Kill a few more warnings and turn off several (like
> newline in format string, non-final method call in constructor)
> | |
> | * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sun Jun 8 18:24:48 2014 -0700
> | |
> | |     MAHOUT-1576 - Fix several low hanging warnings, the most important
> have to do with over-ridable operations in a constructor
> | |
> * |   commit a12135b94002367046ef6edc977527d586026689
> |\ \  Merge: cc9a70e 99fd9ba
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Sun Jun 8 08:25:36 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sat Jun 7 15:09:10 2014 -0700
> | |
> | |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
> | |
> * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
> |/  Author: pferrel <pa...@occamsmachete.com>
> |   Date:   Sat Jun 7 13:36:12 2014 -0700
> |
> |       added .DS_Store to gitignore for pushes from mac
> |
> * commit 63b765abb305cca6d726f54549a92018754a6348
> * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
> | Author: pferrel <pa...@occamsmachete.com>
> | Date:   Thu Jun 12 17:45:09 2014 -0700
> |
> |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
> apache/mahout#12
> |
> *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
> |\  Merge: fd7a0bf a8e09cd
> | | Author: pferrel <pa...@occamsmachete.com>
> | | Date:   Thu Jun 12 11:33:55 2014 -0700
> | |
> | |     Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
> | | Author: ssc <ss...@apache.org>
> | | Date:   Thu Jun 12 19:03:19 2014 +0200
> | |
> | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
> apache/mahout#16
> | |
> * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
> |\ \  Merge: d319b32 b044a07
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Wed Jun 11 19:17:59 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit b044a07797a8fef23d10f10126615c9b7db659bb
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 11:46:32 2014 -0700
> | |
> | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
> | |
> | |     This closes apache/mahout#15
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit 0407577bff365028ceef9798d5835f12a81bc941
> | |     Author: Anand Avati <av...@redhat.com>
> | |     Date:   Mon Jun 9 22:05:14 2014 -0700
> | |
> | |         MAHOUT-1529: spark-shell - cleanup sdc
> | |
> | |         Renaming @sc to @sdc has left open the shutdown part. Spark
> | |         depends on 'implicit sc' to be set by the shell invoker.
> | |
> | |           mahout> Stopping spark context.
> | |           <console>:29: error: not found: value sc
> | |                         sc.stop()
> | |                         ^
> | |
> | |         So override sparkCleanUp() and call @sdc.stop()
> | |
> | |         Signed-off-by: Anand Avati <av...@redhat.com>
> | |
> | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 11:30:55 2014 -0700
> | |
> | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
> the loaded data
> | |
> | |     This closes apache/mahout#10
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 11:27:38 2014 -0700
> | |
> | |         + tests
> | |
> | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
> | |     Merge: 162c5ca 907781b
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 11:04:51 2014 -0700
> | |
> | |         Merge branch 'master' into MAHOUT-1572
> | |
> | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Wed Jun 4 15:10:11 2014 -0700
> | |
> | |         initial fix (?)
> | |
> | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 10:48:55 2014 -0700
> | |
> | |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
> correctly
> | |
> | |     This closes apache/mahout#9
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 10:46:17 2014 -0700
> | |
> | |         Adding test
> | |
> | |     commit ef271380e16192b55c31c7b219195d6982587206
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Wed Jun 4 14:43:24 2014 -0700
> | |
> | |         initial fix (?)
> | |
> | * commit 11046fb5273b559298111b201470d80cd6af43d9
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Mon Jun 9 12:17:00 2014 -0700
> | |
> | |     NOJIRA: switching AlS to mahout's random from scala random to
> ensure deterministic test for the time being.
> | |
> * |   commit d319b325066620a82d079379564188912e8b0b92
> |\ \  Merge: a12135b fcb436d
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Mon Jun 9 07:01:15 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sun Jun 8 21:18:09 2014 -0700
> | |
> | |     MAHOUT-1577 - Restore visibility for getYtransposeY
> | |
> | * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sun Jun 8 20:57:37 2014 -0700
> | |
> | |     MAHOUT-1577 - Kill a few more warnings and turn off several (like
> newline in format string, non-final method call in constructor)
> | |
> | * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sun Jun 8 18:24:48 2014 -0700
> | |
> | |     MAHOUT-1576 - Fix several low hanging warnings, the most important
> have to do with over-ridable operations in a constructor
> | |
> * |   commit a12135b94002367046ef6edc977527d586026689
> |\ \  Merge: cc9a70e 99fd9ba
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Sun Jun 8 08:25:36 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sat Jun 7 15:09:10 2014 -0700
> | |
> | |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
> | |
> * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
> |/  Author: pferrel <pa...@occamsmachete.com>
> |   Date:   Sat Jun 7 13:36:12 2014 -0700
> |
> 
>

Re: master branch history and Git commits - please DO squash your working branches before merging in

Posted by Dmitriy Lyubimov <dl...@gmail.com>.
the recipe seems ok but obviously something wrong did happen since we still
see your history in master.

I'd suggest to check the history explicitly before pushing if unsure.

ASF hooks prevent repairing history (as in rewriting history), and for a
good reason since one got to be even more accurate while doing that than
during simple squash merge, so we cannot undo it now and i guess we'd have
to do what we do a bit more reverently when it comes to pushing to master.

-d


On Fri, Jun 13, 2014 at 11:30 AM, Pat Ferrel <pa...@gmail.com> wrote:

> I did a:
>
> git checkout master
> git merge --squash mahout-1464
>
> did my build, tests, updated changelog then
>
> git commit -a -m “yada yada close PR message"
> git push apache master
>
> something wrong there?
>
> On Jun 13, 2014, at 11:05 AM, Dmitriy Lyubimov <dl...@gmail.com> wrote:
>
> Hi,
>
> I would like to suggest to prohibit merges and intermediate commits in the
> master branch. Please   --squash history from the working branch (as
> defined in PR merge page)!
>
> Not squashing working branch history  makes it difficult to (1) attribute
> intermediate commits to a Mahout issue as not all intermediate commit
> messages clearly state so; and (2) be able to correct history if needed,
> with rollbacks.
>
> (I do list working branch history in commit description; or, rather, git
> does it automatically for me, but they are not commits in the master).
>
> Bottom line, it is a mess (Pat, i am winking at you :)
>
> * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
> | Author: pferrel <pa...@occamsmachete.com>
> | Date:   Thu Jun 12 17:45:09 2014 -0700
> |
> |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
> apache/mahout#12
> |
> *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
> |\  Merge: fd7a0bf a8e09cd
> | | Author: pferrel <pa...@occamsmachete.com>
> | | Date:   Thu Jun 12 11:33:55 2014 -0700
> | |
> | |     Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
> | | Author: ssc <ss...@apache.org>
> | | Date:   Thu Jun 12 19:03:19 2014 +0200
> | |
> | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
> apache/mahout#16
> | |
> * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
> |\ \  Merge: d319b32 b044a07
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Wed Jun 11 19:17:59 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit b044a07797a8fef23d10f10126615c9b7db659bb
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 11:46:32 2014 -0700
> | |
> | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
> | |
> | |     This closes apache/mahout#15
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit 0407577bff365028ceef9798d5835f12a81bc941
> | |     Author: Anand Avati <av...@redhat.com>
> | |     Date:   Mon Jun 9 22:05:14 2014 -0700
> | |
> | |         MAHOUT-1529: spark-shell - cleanup sdc
> | |
> | |         Renaming @sc to @sdc has left open the shutdown part. Spark
> | |         depends on 'implicit sc' to be set by the shell invoker.
> | |
> | |           mahout> Stopping spark context.
> | |           <console>:29: error: not found: value sc
> | |                         sc.stop()
> | |                         ^
> | |
> | |         So override sparkCleanUp() and call @sdc.stop()
> | |
> | |         Signed-off-by: Anand Avati <av...@redhat.com>
> | |
> | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 11:30:55 2014 -0700
> | |
> | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
> the loaded data
> | |
> | |     This closes apache/mahout#10
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 11:27:38 2014 -0700
> | |
> | |         + tests
> | |
> | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
> | |     Merge: 162c5ca 907781b
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 11:04:51 2014 -0700
> | |
> | |         Merge branch 'master' into MAHOUT-1572
> | |
> | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Wed Jun 4 15:10:11 2014 -0700
> | |
> | |         initial fix (?)
> | |
> | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 10:48:55 2014 -0700
> | |
> | |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
> correctly
> | |
> | |     This closes apache/mahout#9
> * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
> | Author: pferrel <pa...@occamsmachete.com>
> | Date:   Thu Jun 12 17:45:09 2014 -0700
> |
> |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
> apache/mahout#12
> |
> *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
> |\  Merge: fd7a0bf a8e09cd
> | | Author: pferrel <pa...@occamsmachete.com>
> | | Date:   Thu Jun 12 11:33:55 2014 -0700
> | |
> | |     Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
> | | Author: ssc <ss...@apache.org>
> | | Date:   Thu Jun 12 19:03:19 2014 +0200
> | |
> | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
> apache/mahout#16
> | |
> * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
> |\ \  Merge: d319b32 b044a07
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Wed Jun 11 19:17:59 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit b044a07797a8fef23d10f10126615c9b7db659bb
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 11:46:32 2014 -0700
> | |
> | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
> | |
> | |     This closes apache/mahout#15
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit 0407577bff365028ceef9798d5835f12a81bc941
> | |     Author: Anand Avati <av...@redhat.com>
> | |     Date:   Mon Jun 9 22:05:14 2014 -0700
> | |
> | |         MAHOUT-1529: spark-shell - cleanup sdc
> | |
> | |         Renaming @sc to @sdc has left open the shutdown part. Spark
> | |         depends on 'implicit sc' to be set by the shell invoker.
> | |
> | |           mahout> Stopping spark context.
> | |           <console>:29: error: not found: value sc
> | |                         sc.stop()
> | |                         ^
> | |
> | |         So override sparkCleanUp() and call @sdc.stop()
> | |
> | |         Signed-off-by: Anand Avati <av...@redhat.com>
> | |
> | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 11:30:55 2014 -0700
> | |
> | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
> the loaded data
> | |
> | |     This closes apache/mahout#10
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 11:27:38 2014 -0700
> | |
> | |         + tests
> | |
> | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
> | |     Merge: 162c5ca 907781b
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 11:04:51 2014 -0700
> | |
> | |         Merge branch 'master' into MAHOUT-1572
> | |
> | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Wed Jun 4 15:10:11 2014 -0700
> | |
> | |         initial fix (?)
> | |
> | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 10:48:55 2014 -0700
> | |
> | |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
> correctly
> | |
> | |     This closes apache/mahout#9
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 10:46:17 2014 -0700
> | |
> | |         Adding test
> | |
> | |     commit ef271380e16192b55c31c7b219195d6982587206
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Wed Jun 4 14:43:24 2014 -0700
> | |
> | |         initial fix (?)
> | |
> | * commit 11046fb5273b559298111b201470d80cd6af43d9
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Mon Jun 9 12:17:00 2014 -0700
> | |
> | |     NOJIRA: switching AlS to mahout's random from scala random to
> ensure deterministic test for the time being.
> | |
> * |   commit d319b325066620a82d079379564188912e8b0b92
> |\ \  Merge: a12135b fcb436d
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Mon Jun 9 07:01:15 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sun Jun 8 21:18:09 2014 -0700
> | |
> | |     MAHOUT-1577 - Restore visibility for getYtransposeY
> | |
> | * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sun Jun 8 20:57:37 2014 -0700
> | |
> | |     MAHOUT-1577 - Kill a few more warnings and turn off several (like
> newline in format string, non-final method call in constructor)
> | |
> | * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sun Jun 8 18:24:48 2014 -0700
> | |
> | |     MAHOUT-1576 - Fix several low hanging warnings, the most important
> have to do with over-ridable operations in a constructor
> | |
> * |   commit a12135b94002367046ef6edc977527d586026689
> |\ \  Merge: cc9a70e 99fd9ba
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Sun Jun 8 08:25:36 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sat Jun 7 15:09:10 2014 -0700
> | |
> | |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
> | |
> * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
> |/  Author: pferrel <pa...@occamsmachete.com>
> |   Date:   Sat Jun 7 13:36:12 2014 -0700
> |
> |       added .DS_Store to gitignore for pushes from mac
> |
> * commit 63b765abb305cca6d726f54549a92018754a6348
> * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
> | Author: pferrel <pa...@occamsmachete.com>
> | Date:   Thu Jun 12 17:45:09 2014 -0700
> |
> |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
> apache/mahout#12
> |
> *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
> |\  Merge: fd7a0bf a8e09cd
> | | Author: pferrel <pa...@occamsmachete.com>
> | | Date:   Thu Jun 12 11:33:55 2014 -0700
> | |
> | |     Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
> | | Author: ssc <ss...@apache.org>
> | | Date:   Thu Jun 12 19:03:19 2014 +0200
> | |
> | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
> apache/mahout#16
> | |
> * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
> |\ \  Merge: d319b32 b044a07
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Wed Jun 11 19:17:59 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit b044a07797a8fef23d10f10126615c9b7db659bb
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 11:46:32 2014 -0700
> | |
> | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
> | |
> | |     This closes apache/mahout#15
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit 0407577bff365028ceef9798d5835f12a81bc941
> | |     Author: Anand Avati <av...@redhat.com>
> | |     Date:   Mon Jun 9 22:05:14 2014 -0700
> | |
> | |         MAHOUT-1529: spark-shell - cleanup sdc
> | |
> | |         Renaming @sc to @sdc has left open the shutdown part. Spark
> | |         depends on 'implicit sc' to be set by the shell invoker.
> | |
> | |           mahout> Stopping spark context.
> | |           <console>:29: error: not found: value sc
> | |                         sc.stop()
> | |                         ^
> | |
> | |         So override sparkCleanUp() and call @sdc.stop()
> | |
> | |         Signed-off-by: Anand Avati <av...@redhat.com>
> | |
> | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 11:30:55 2014 -0700
> | |
> | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
> the loaded data
> | |
> | |     This closes apache/mahout#10
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 11:27:38 2014 -0700
> | |
> | |         + tests
> | |
> | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
> | |     Merge: 162c5ca 907781b
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 11:04:51 2014 -0700
> | |
> | |         Merge branch 'master' into MAHOUT-1572
> | |
> | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Wed Jun 4 15:10:11 2014 -0700
> | |
> | |         initial fix (?)
> | |
> | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 10:48:55 2014 -0700
> | |
> | |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
> correctly
> | |
> | |     This closes apache/mahout#9
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 10:46:17 2014 -0700
> | |
> | |         Adding test
> | |
> | |     commit ef271380e16192b55c31c7b219195d6982587206
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Wed Jun 4 14:43:24 2014 -0700
> | |
> | |         initial fix (?)
> | |
> | * commit 11046fb5273b559298111b201470d80cd6af43d9
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Mon Jun 9 12:17:00 2014 -0700
> | |
> | |     NOJIRA: switching AlS to mahout's random from scala random to
> ensure deterministic test for the time being.
> | |
> * |   commit d319b325066620a82d079379564188912e8b0b92
> |\ \  Merge: a12135b fcb436d
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Mon Jun 9 07:01:15 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sun Jun 8 21:18:09 2014 -0700
> | |
> | |     MAHOUT-1577 - Restore visibility for getYtransposeY
> | |
> | * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sun Jun 8 20:57:37 2014 -0700
> | |
> | |     MAHOUT-1577 - Kill a few more warnings and turn off several (like
> newline in format string, non-final method call in constructor)
> | |
> | * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sun Jun 8 18:24:48 2014 -0700
> | |
> | |     MAHOUT-1576 - Fix several low hanging warnings, the most important
> have to do with over-ridable operations in a constructor
> | |
> * |   commit a12135b94002367046ef6edc977527d586026689
> |\ \  Merge: cc9a70e 99fd9ba
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Sun Jun 8 08:25:36 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sat Jun 7 15:09:10 2014 -0700
> | |
> | |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
> | |
> * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
> |/  Author: pferrel <pa...@occamsmachete.com>
> |   Date:   Sat Jun 7 13:36:12 2014 -0700
> |
> |       added .DS_Store to gitignore for pushes from mac
> |
> * commit 63b765abb305cca6d726f54549a92018754a6348
> * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
> | Author: pferrel <pa...@occamsmachete.com>
> | Date:   Thu Jun 12 17:45:09 2014 -0700
> |
> |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
> apache/mahout#12
> |
> *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
> |\  Merge: fd7a0bf a8e09cd
> | | Author: pferrel <pa...@occamsmachete.com>
> | | Date:   Thu Jun 12 11:33:55 2014 -0700
> | |
> | |     Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
> | | Author: ssc <ss...@apache.org>
> | | Date:   Thu Jun 12 19:03:19 2014 +0200
> | |
> | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
> apache/mahout#16
> | |
> * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
> |\ \  Merge: d319b32 b044a07
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Wed Jun 11 19:17:59 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit b044a07797a8fef23d10f10126615c9b7db659bb
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 11:46:32 2014 -0700
> | |
> | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
> | |
> | |     This closes apache/mahout#15
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit 0407577bff365028ceef9798d5835f12a81bc941
> | |     Author: Anand Avati <av...@redhat.com>
> | |     Date:   Mon Jun 9 22:05:14 2014 -0700
> | |
> | |         MAHOUT-1529: spark-shell - cleanup sdc
> | |
> | |         Renaming @sc to @sdc has left open the shutdown part. Spark
> | |         depends on 'implicit sc' to be set by the shell invoker.
> | |
> | |           mahout> Stopping spark context.
> | |           <console>:29: error: not found: value sc
> | |                         sc.stop()
> | |                         ^
> | |
> | |         So override sparkCleanUp() and call @sdc.stop()
> | |
> | |         Signed-off-by: Anand Avati <av...@redhat.com>
> | |
> | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 11:30:55 2014 -0700
> | |
> | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
> the loaded data
> | |
> | |     This closes apache/mahout#10
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 11:27:38 2014 -0700
> | |
> | |         + tests
> | |
> | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
> | |     Merge: 162c5ca 907781b
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 11:04:51 2014 -0700
> | |
> | |         Merge branch 'master' into MAHOUT-1572
> | |
> | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Wed Jun 4 15:10:11 2014 -0700
> | |
> | |         initial fix (?)
> | |
> | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 10:48:55 2014 -0700
> | |
> | |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
> correctly
> | |
> | |     This closes apache/mahout#9
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 10:46:17 2014 -0700
> | |
> | |         Adding test
> | |
> | |     commit ef271380e16192b55c31c7b219195d6982587206
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Wed Jun 4 14:43:24 2014 -0700
> | |
> | |         initial fix (?)
> | |
> | * commit 11046fb5273b559298111b201470d80cd6af43d9
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Mon Jun 9 12:17:00 2014 -0700
> | |
> | |     NOJIRA: switching AlS to mahout's random from scala random to
> ensure deterministic test for the time being.
> | |
> * |   commit d319b325066620a82d079379564188912e8b0b92
> |\ \  Merge: a12135b fcb436d
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Mon Jun 9 07:01:15 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sun Jun 8 21:18:09 2014 -0700
> | |
> | |     MAHOUT-1577 - Restore visibility for getYtransposeY
> | |
> | * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sun Jun 8 20:57:37 2014 -0700
> | |
> | |     MAHOUT-1577 - Kill a few more warnings and turn off several (like
> newline in format string, non-final method call in constructor)
> | |
> | * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sun Jun 8 18:24:48 2014 -0700
> | |
> | |     MAHOUT-1576 - Fix several low hanging warnings, the most important
> have to do with over-ridable operations in a constructor
> | |
> * |   commit a12135b94002367046ef6edc977527d586026689
> |\ \  Merge: cc9a70e 99fd9ba
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Sun Jun 8 08:25:36 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sat Jun 7 15:09:10 2014 -0700
> | |
> | |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
> | |
> * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
> |/  Author: pferrel <pa...@occamsmachete.com>
> |   Date:   Sat Jun 7 13:36:12 2014 -0700
> |
>
>

Re: master branch history and Git commits - please DO squash your working branches before merging in

Posted by Pat Ferrel <pa...@gmail.com>.
I did a:

git checkout master
git merge --squash mahout-1464 

did my build, tests, updated changelog then 

git commit -a -m “yada yada close PR message"
git push apache master

something wrong there?

On Jun 13, 2014, at 11:05 AM, Dmitriy Lyubimov <dl...@gmail.com> wrote:

Hi,

I would like to suggest to prohibit merges and intermediate commits in the
master branch. Please   --squash history from the working branch (as
defined in PR merge page)!

Not squashing working branch history  makes it difficult to (1) attribute
intermediate commits to a Mahout issue as not all intermediate commit
messages clearly state so; and (2) be able to correct history if needed,
with rollbacks.

(I do list working branch history in commit description; or, rather, git
does it automatically for me, but they are not commits in the master).

Bottom line, it is a mess (Pat, i am winking at you :)

* commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
| Author: pferrel <pa...@occamsmachete.com>
| Date:   Thu Jun 12 17:45:09 2014 -0700
|
|     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
apache/mahout#12
|
*   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
|\  Merge: fd7a0bf a8e09cd
| | Author: pferrel <pa...@occamsmachete.com>
| | Date:   Thu Jun 12 11:33:55 2014 -0700
| |
| |     Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
| |
| * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
| | Author: ssc <ss...@apache.org>
| | Date:   Thu Jun 12 19:03:19 2014 +0200
| |
| |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
apache/mahout#16
| |
* |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
|\ \  Merge: d319b32 b044a07
| |/  Author: pferrel <pa...@occamsmachete.com>
| |   Date:   Wed Jun 11 19:17:59 2014 -0700
| |
| |       Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
| |
| * commit b044a07797a8fef23d10f10126615c9b7db659bb
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Tue Jun 10 11:46:32 2014 -0700
| |
| |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
| |
| |     This closes apache/mahout#15
| |
| |     Squashed commit of the following:
| |
| |     commit 0407577bff365028ceef9798d5835f12a81bc941
| |     Author: Anand Avati <av...@redhat.com>
| |     Date:   Mon Jun 9 22:05:14 2014 -0700
| |
| |         MAHOUT-1529: spark-shell - cleanup sdc
| |
| |         Renaming @sc to @sdc has left open the shutdown part. Spark
| |         depends on 'implicit sc' to be set by the shell invoker.
| |
| |           mahout> Stopping spark context.
| |           <console>:29: error: not found: value sc
| |                         sc.stop()
| |                         ^
| |
| |         So override sparkCleanUp() and call @sdc.stop()
| |
| |         Signed-off-by: Anand Avati <av...@redhat.com>
| |
| * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Tue Jun 10 11:30:55 2014 -0700
| |
| |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
the loaded data
| |
| |     This closes apache/mahout#10
| |
| |     Squashed commit of the following:
| |
| |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Tue Jun 10 11:27:38 2014 -0700
| |
| |         + tests
| |
| |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
| |     Merge: 162c5ca 907781b
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Tue Jun 10 11:04:51 2014 -0700
| |
| |         Merge branch 'master' into MAHOUT-1572
| |
| |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Wed Jun 4 15:10:11 2014 -0700
| |
| |         initial fix (?)
| |
| * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Tue Jun 10 10:48:55 2014 -0700
| |
| |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
correctly
| |
| |     This closes apache/mahout#9
* commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
| Author: pferrel <pa...@occamsmachete.com>
| Date:   Thu Jun 12 17:45:09 2014 -0700
|
|     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
apache/mahout#12
|
*   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
|\  Merge: fd7a0bf a8e09cd
| | Author: pferrel <pa...@occamsmachete.com>
| | Date:   Thu Jun 12 11:33:55 2014 -0700
| |
| |     Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
| |
| * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
| | Author: ssc <ss...@apache.org>
| | Date:   Thu Jun 12 19:03:19 2014 +0200
| |
| |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
apache/mahout#16
| |
* |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
|\ \  Merge: d319b32 b044a07
| |/  Author: pferrel <pa...@occamsmachete.com>
| |   Date:   Wed Jun 11 19:17:59 2014 -0700
| |
| |       Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
| |
| * commit b044a07797a8fef23d10f10126615c9b7db659bb
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Tue Jun 10 11:46:32 2014 -0700
| |
| |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
| |
| |     This closes apache/mahout#15
| |
| |     Squashed commit of the following:
| |
| |     commit 0407577bff365028ceef9798d5835f12a81bc941
| |     Author: Anand Avati <av...@redhat.com>
| |     Date:   Mon Jun 9 22:05:14 2014 -0700
| |
| |         MAHOUT-1529: spark-shell - cleanup sdc
| |
| |         Renaming @sc to @sdc has left open the shutdown part. Spark
| |         depends on 'implicit sc' to be set by the shell invoker.
| |
| |           mahout> Stopping spark context.
| |           <console>:29: error: not found: value sc
| |                         sc.stop()
| |                         ^
| |
| |         So override sparkCleanUp() and call @sdc.stop()
| |
| |         Signed-off-by: Anand Avati <av...@redhat.com>
| |
| * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Tue Jun 10 11:30:55 2014 -0700
| |
| |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
the loaded data
| |
| |     This closes apache/mahout#10
| |
| |     Squashed commit of the following:
| |
| |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Tue Jun 10 11:27:38 2014 -0700
| |
| |         + tests
| |
| |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
| |     Merge: 162c5ca 907781b
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Tue Jun 10 11:04:51 2014 -0700
| |
| |         Merge branch 'master' into MAHOUT-1572
| |
| |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Wed Jun 4 15:10:11 2014 -0700
| |
| |         initial fix (?)
| |
| * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Tue Jun 10 10:48:55 2014 -0700
| |
| |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
correctly
| |
| |     This closes apache/mahout#9
| |
| |     Squashed commit of the following:
| |
| |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Tue Jun 10 10:46:17 2014 -0700
| |
| |         Adding test
| |
| |     commit ef271380e16192b55c31c7b219195d6982587206
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Wed Jun 4 14:43:24 2014 -0700
| |
| |         initial fix (?)
| |
| * commit 11046fb5273b559298111b201470d80cd6af43d9
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Mon Jun 9 12:17:00 2014 -0700
| |
| |     NOJIRA: switching AlS to mahout's random from scala random to
ensure deterministic test for the time being.
| |
* |   commit d319b325066620a82d079379564188912e8b0b92
|\ \  Merge: a12135b fcb436d
| |/  Author: pferrel <pa...@occamsmachete.com>
| |   Date:   Mon Jun 9 07:01:15 2014 -0700
| |
| |       Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
| |
| * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
| | Author: Ted Dunning <td...@apache.org>
| | Date:   Sun Jun 8 21:18:09 2014 -0700
| |
| |     MAHOUT-1577 - Restore visibility for getYtransposeY
| |
| * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
| | Author: Ted Dunning <td...@apache.org>
| | Date:   Sun Jun 8 20:57:37 2014 -0700
| |
| |     MAHOUT-1577 - Kill a few more warnings and turn off several (like
newline in format string, non-final method call in constructor)
| |
| * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
| | Author: Ted Dunning <td...@apache.org>
| | Date:   Sun Jun 8 18:24:48 2014 -0700
| |
| |     MAHOUT-1576 - Fix several low hanging warnings, the most important
have to do with over-ridable operations in a constructor
| |
* |   commit a12135b94002367046ef6edc977527d586026689
|\ \  Merge: cc9a70e 99fd9ba
| |/  Author: pferrel <pa...@occamsmachete.com>
| |   Date:   Sun Jun 8 08:25:36 2014 -0700
| |
| |       Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
| |
| * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
| | Author: Ted Dunning <td...@apache.org>
| | Date:   Sat Jun 7 15:09:10 2014 -0700
| |
| |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
| |
* | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
|/  Author: pferrel <pa...@occamsmachete.com>
|   Date:   Sat Jun 7 13:36:12 2014 -0700
|
|       added .DS_Store to gitignore for pushes from mac
|
* commit 63b765abb305cca6d726f54549a92018754a6348
* commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
| Author: pferrel <pa...@occamsmachete.com>
| Date:   Thu Jun 12 17:45:09 2014 -0700
|
|     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
apache/mahout#12
|
*   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
|\  Merge: fd7a0bf a8e09cd
| | Author: pferrel <pa...@occamsmachete.com>
| | Date:   Thu Jun 12 11:33:55 2014 -0700
| |
| |     Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
| |
| * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
| | Author: ssc <ss...@apache.org>
| | Date:   Thu Jun 12 19:03:19 2014 +0200
| |
| |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
apache/mahout#16
| |
* |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
|\ \  Merge: d319b32 b044a07
| |/  Author: pferrel <pa...@occamsmachete.com>
| |   Date:   Wed Jun 11 19:17:59 2014 -0700
| |
| |       Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
| |
| * commit b044a07797a8fef23d10f10126615c9b7db659bb
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Tue Jun 10 11:46:32 2014 -0700
| |
| |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
| |
| |     This closes apache/mahout#15
| |
| |     Squashed commit of the following:
| |
| |     commit 0407577bff365028ceef9798d5835f12a81bc941
| |     Author: Anand Avati <av...@redhat.com>
| |     Date:   Mon Jun 9 22:05:14 2014 -0700
| |
| |         MAHOUT-1529: spark-shell - cleanup sdc
| |
| |         Renaming @sc to @sdc has left open the shutdown part. Spark
| |         depends on 'implicit sc' to be set by the shell invoker.
| |
| |           mahout> Stopping spark context.
| |           <console>:29: error: not found: value sc
| |                         sc.stop()
| |                         ^
| |
| |         So override sparkCleanUp() and call @sdc.stop()
| |
| |         Signed-off-by: Anand Avati <av...@redhat.com>
| |
| * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Tue Jun 10 11:30:55 2014 -0700
| |
| |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
the loaded data
| |
| |     This closes apache/mahout#10
| |
| |     Squashed commit of the following:
| |
| |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Tue Jun 10 11:27:38 2014 -0700
| |
| |         + tests
| |
| |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
| |     Merge: 162c5ca 907781b
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Tue Jun 10 11:04:51 2014 -0700
| |
| |         Merge branch 'master' into MAHOUT-1572
| |
| |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Wed Jun 4 15:10:11 2014 -0700
| |
| |         initial fix (?)
| |
| * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Tue Jun 10 10:48:55 2014 -0700
| |
| |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
correctly
| |
| |     This closes apache/mahout#9
| |
| |     Squashed commit of the following:
| |
| |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Tue Jun 10 10:46:17 2014 -0700
| |
| |         Adding test
| |
| |     commit ef271380e16192b55c31c7b219195d6982587206
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Wed Jun 4 14:43:24 2014 -0700
| |
| |         initial fix (?)
| |
| * commit 11046fb5273b559298111b201470d80cd6af43d9
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Mon Jun 9 12:17:00 2014 -0700
| |
| |     NOJIRA: switching AlS to mahout's random from scala random to
ensure deterministic test for the time being.
| |
* |   commit d319b325066620a82d079379564188912e8b0b92
|\ \  Merge: a12135b fcb436d
| |/  Author: pferrel <pa...@occamsmachete.com>
| |   Date:   Mon Jun 9 07:01:15 2014 -0700
| |
| |       Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
| |
| * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
| | Author: Ted Dunning <td...@apache.org>
| | Date:   Sun Jun 8 21:18:09 2014 -0700
| |
| |     MAHOUT-1577 - Restore visibility for getYtransposeY
| |
| * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
| | Author: Ted Dunning <td...@apache.org>
| | Date:   Sun Jun 8 20:57:37 2014 -0700
| |
| |     MAHOUT-1577 - Kill a few more warnings and turn off several (like
newline in format string, non-final method call in constructor)
| |
| * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
| | Author: Ted Dunning <td...@apache.org>
| | Date:   Sun Jun 8 18:24:48 2014 -0700
| |
| |     MAHOUT-1576 - Fix several low hanging warnings, the most important
have to do with over-ridable operations in a constructor
| |
* |   commit a12135b94002367046ef6edc977527d586026689
|\ \  Merge: cc9a70e 99fd9ba
| |/  Author: pferrel <pa...@occamsmachete.com>
| |   Date:   Sun Jun 8 08:25:36 2014 -0700
| |
| |       Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
| |
| * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
| | Author: Ted Dunning <td...@apache.org>
| | Date:   Sat Jun 7 15:09:10 2014 -0700
| |
| |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
| |
* | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
|/  Author: pferrel <pa...@occamsmachete.com>
|   Date:   Sat Jun 7 13:36:12 2014 -0700
|
|       added .DS_Store to gitignore for pushes from mac
|
* commit 63b765abb305cca6d726f54549a92018754a6348
* commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
| Author: pferrel <pa...@occamsmachete.com>
| Date:   Thu Jun 12 17:45:09 2014 -0700
|
|     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
apache/mahout#12
|
*   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
|\  Merge: fd7a0bf a8e09cd
| | Author: pferrel <pa...@occamsmachete.com>
| | Date:   Thu Jun 12 11:33:55 2014 -0700
| |
| |     Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
| |
| * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
| | Author: ssc <ss...@apache.org>
| | Date:   Thu Jun 12 19:03:19 2014 +0200
| |
| |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
apache/mahout#16
| |
* |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
|\ \  Merge: d319b32 b044a07
| |/  Author: pferrel <pa...@occamsmachete.com>
| |   Date:   Wed Jun 11 19:17:59 2014 -0700
| |
| |       Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
| |
| * commit b044a07797a8fef23d10f10126615c9b7db659bb
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Tue Jun 10 11:46:32 2014 -0700
| |
| |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
| |
| |     This closes apache/mahout#15
| |
| |     Squashed commit of the following:
| |
| |     commit 0407577bff365028ceef9798d5835f12a81bc941
| |     Author: Anand Avati <av...@redhat.com>
| |     Date:   Mon Jun 9 22:05:14 2014 -0700
| |
| |         MAHOUT-1529: spark-shell - cleanup sdc
| |
| |         Renaming @sc to @sdc has left open the shutdown part. Spark
| |         depends on 'implicit sc' to be set by the shell invoker.
| |
| |           mahout> Stopping spark context.
| |           <console>:29: error: not found: value sc
| |                         sc.stop()
| |                         ^
| |
| |         So override sparkCleanUp() and call @sdc.stop()
| |
| |         Signed-off-by: Anand Avati <av...@redhat.com>
| |
| * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Tue Jun 10 11:30:55 2014 -0700
| |
| |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
the loaded data
| |
| |     This closes apache/mahout#10
| |
| |     Squashed commit of the following:
| |
| |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Tue Jun 10 11:27:38 2014 -0700
| |
| |         + tests
| |
| |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
| |     Merge: 162c5ca 907781b
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Tue Jun 10 11:04:51 2014 -0700
| |
| |         Merge branch 'master' into MAHOUT-1572
| |
| |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Wed Jun 4 15:10:11 2014 -0700
| |
| |         initial fix (?)
| |
| * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Tue Jun 10 10:48:55 2014 -0700
| |
| |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
correctly
| |
| |     This closes apache/mahout#9
| |
| |     Squashed commit of the following:
| |
| |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Tue Jun 10 10:46:17 2014 -0700
| |
| |         Adding test
| |
| |     commit ef271380e16192b55c31c7b219195d6982587206
| |     Author: Dmitriy Lyubimov <dl...@apache.org>
| |     Date:   Wed Jun 4 14:43:24 2014 -0700
| |
| |         initial fix (?)
| |
| * commit 11046fb5273b559298111b201470d80cd6af43d9
| | Author: Dmitriy Lyubimov <dl...@apache.org>
| | Date:   Mon Jun 9 12:17:00 2014 -0700
| |
| |     NOJIRA: switching AlS to mahout's random from scala random to
ensure deterministic test for the time being.
| |
* |   commit d319b325066620a82d079379564188912e8b0b92
|\ \  Merge: a12135b fcb436d
| |/  Author: pferrel <pa...@occamsmachete.com>
| |   Date:   Mon Jun 9 07:01:15 2014 -0700
| |
| |       Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
| |
| * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
| | Author: Ted Dunning <td...@apache.org>
| | Date:   Sun Jun 8 21:18:09 2014 -0700
| |
| |     MAHOUT-1577 - Restore visibility for getYtransposeY
| |
| * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
| | Author: Ted Dunning <td...@apache.org>
| | Date:   Sun Jun 8 20:57:37 2014 -0700
| |
| |     MAHOUT-1577 - Kill a few more warnings and turn off several (like
newline in format string, non-final method call in constructor)
| |
| * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
| | Author: Ted Dunning <td...@apache.org>
| | Date:   Sun Jun 8 18:24:48 2014 -0700
| |
| |     MAHOUT-1576 - Fix several low hanging warnings, the most important
have to do with over-ridable operations in a constructor
| |
* |   commit a12135b94002367046ef6edc977527d586026689
|\ \  Merge: cc9a70e 99fd9ba
| |/  Author: pferrel <pa...@occamsmachete.com>
| |   Date:   Sun Jun 8 08:25:36 2014 -0700
| |
| |       Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
| |
| * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
| | Author: Ted Dunning <td...@apache.org>
| | Date:   Sat Jun 7 15:09:10 2014 -0700
| |
| |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
| |
* | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
|/  Author: pferrel <pa...@occamsmachete.com>
|   Date:   Sat Jun 7 13:36:12 2014 -0700
|

Re: master branch history and Git commits - please DO squash your working branches before merging in

Posted by Pat Ferrel <pa...@gmail.com>.
OK, just did another push closing #18. I checked the logs and saw only one commit message and no graph additions.

Looking at other people squash logs shows their commit messages all inline with one master commit. commit 8c529ccff23d419c4cb5191b0435de40d6a9831c shows 4 grouped messages corresponding to the branch commits I assume. I had branch commits too but they are not squashed into the log. Is this as expected?
 
On Jun 13, 2014, at 2:42 PM, Dmitriy Lyubimov <dl...@gmail.com> wrote:

And finally, since github is open to anyone, note that pushing to github
means collaboration whether you want it or not. So even if I don't plan to
work with anyone on github, someone may be pulling off my github branch
without me realizing it (like it more or less happened with me and Pat),
and if I were pushing rebases to my branch, i'd screw his branch to no end.
This may be incredibly frustrating (ask me how i know :)


On Fri, Jun 13, 2014 at 2:35 PM, Dmitriy Lyubimov <dl...@gmail.com> wrote:

> Sure. there are exceptions. If i got exactly one commit and it has a
> proper message, rebase would do.
> 
> But let's look at pferrel/mahout MAHOUT-1464 PR. There are couple dozen of
> working branch commits there. I'd say in such situation squash is a must
> (even if they are rebased on top).
> 
> Also keep in mind that rebase of a remote working branch will screw
> collaboration (in case there's more than one person working on an issue via
> github working branch). Since pushing rebases would imply rewriting remote
> history (exactly the reason infra doesn't allow it in git-wip-us). So any
> way you look at rebase benefits, it looks like there are increasingly rare
> exceptions to admit it to happen in any remote repo and even consider its
> worth beyond the boundaries of one's own git repo on local FS.
> 
> 
> 
> 
> On Fri, Jun 13, 2014 at 2:27 PM, Ted Dunning <te...@gmail.com>
> wrote:
> 
>> I would accept that argument except that there will be exceptions.
>> 
>> Thus, I would phrase it as a strongly suggested guideline rather than a
>> hard and fast rule.
>> 
>> 
>> 
>> 
>> On Fri, Jun 13, 2014 at 11:20 AM, Dmitriy Lyubimov <dl...@gmail.com>
>> wrote:
>> 
>>> in fact, i'd argue we don't want more than 1 commit per issue -- unless
>>> there's a reopening -- and definitely do not want more than 1 commit
>> per PR
>>> 
>>> 
>>> On Fri, Jun 13, 2014 at 11:18 AM, Dmitriy Lyubimov <dl...@gmail.com>
>>> wrote:
>>> 
>>>> 
>>>> 
>>>> 
>>>> On Fri, Jun 13, 2014 at 11:14 AM, Ted Dunning <te...@gmail.com>
>>>> wrote:
>>>> 
>>>>> I think that rebasing cleanly would help at least as much as
>> squashing.
>>>>> Both are probably good.
>>>>> 
>>>> 
>>>> Rebasing doesn't get rid of intermediate commits, it only gets rid of
>>>> merges. which means you will be left with commits like below sitting
>> in
>>>> your history anyway as actual commits without clean attribution -- and
>>> I'd
>>>> argue we don't want that
>>>> 
>>>> * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
>>>> |/  Author: pferrel <pa...@occamsmachete.com>
>>>> |   Date:   Sat Jun 7 13:36:12 2014 -0700
>>>> |
>>>> |       added .DS_Store to gitignore for pushes from mac
>>>> |
>>>> 
>>>> 
>>>> 
>>>> 
>>> 
>> 
> 
>

Re: master branch history and Git commits - please DO squash your working branches before merging in

Posted by Dmitriy Lyubimov <dl...@gmail.com>.
And finally, since github is open to anyone, note that pushing to github
means collaboration whether you want it or not. So even if I don't plan to
work with anyone on github, someone may be pulling off my github branch
without me realizing it (like it more or less happened with me and Pat),
and if I were pushing rebases to my branch, i'd screw his branch to no end.
This may be incredibly frustrating (ask me how i know :)


On Fri, Jun 13, 2014 at 2:35 PM, Dmitriy Lyubimov <dl...@gmail.com> wrote:

> Sure. there are exceptions. If i got exactly one commit and it has a
> proper message, rebase would do.
>
> But let's look at pferrel/mahout MAHOUT-1464 PR. There are couple dozen of
> working branch commits there. I'd say in such situation squash is a must
> (even if they are rebased on top).
>
> Also keep in mind that rebase of a remote working branch will screw
> collaboration (in case there's more than one person working on an issue via
> github working branch). Since pushing rebases would imply rewriting remote
> history (exactly the reason infra doesn't allow it in git-wip-us). So any
> way you look at rebase benefits, it looks like there are increasingly rare
> exceptions to admit it to happen in any remote repo and even consider its
> worth beyond the boundaries of one's own git repo on local FS.
>
>
>
>
> On Fri, Jun 13, 2014 at 2:27 PM, Ted Dunning <te...@gmail.com>
> wrote:
>
>> I would accept that argument except that there will be exceptions.
>>
>> Thus, I would phrase it as a strongly suggested guideline rather than a
>> hard and fast rule.
>>
>>
>>
>>
>> On Fri, Jun 13, 2014 at 11:20 AM, Dmitriy Lyubimov <dl...@gmail.com>
>> wrote:
>>
>> > in fact, i'd argue we don't want more than 1 commit per issue -- unless
>> > there's a reopening -- and definitely do not want more than 1 commit
>> per PR
>> >
>> >
>> > On Fri, Jun 13, 2014 at 11:18 AM, Dmitriy Lyubimov <dl...@gmail.com>
>> > wrote:
>> >
>> > >
>> > >
>> > >
>> > > On Fri, Jun 13, 2014 at 11:14 AM, Ted Dunning <te...@gmail.com>
>> > > wrote:
>> > >
>> > >> I think that rebasing cleanly would help at least as much as
>> squashing.
>> > >>  Both are probably good.
>> > >>
>> > >
>> > > Rebasing doesn't get rid of intermediate commits, it only gets rid of
>> > > merges. which means you will be left with commits like below sitting
>> in
>> > > your history anyway as actual commits without clean attribution -- and
>> > I'd
>> > > argue we don't want that
>> > >
>> > > * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
>> > > |/  Author: pferrel <pa...@occamsmachete.com>
>> > > |   Date:   Sat Jun 7 13:36:12 2014 -0700
>> > > |
>> > > |       added .DS_Store to gitignore for pushes from mac
>> > > |
>> > >
>> > >
>> > >
>> > >
>> >
>>
>
>

Re: master branch history and Git commits - please DO squash your working branches before merging in

Posted by Dmitriy Lyubimov <dl...@gmail.com>.
Sure. there are exceptions. If i got exactly one commit and it has a proper
message, rebase would do.

But let's look at pferrel/mahout MAHOUT-1464 PR. There are couple dozen of
working branch commits there. I'd say in such situation squash is a must
(even if they are rebased on top).

Also keep in mind that rebase of a remote working branch will screw
collaboration (in case there's more than one person working on an issue via
github working branch). Since pushing rebases would imply rewriting remote
history (exactly the reason infra doesn't allow it in git-wip-us). So any
way you look at rebase benefits, it looks like there are increasingly rare
exceptions to admit it to happen in any remote repo and even consider its
worth beyond the boundaries of one's own git repo on local FS.




On Fri, Jun 13, 2014 at 2:27 PM, Ted Dunning <te...@gmail.com> wrote:

> I would accept that argument except that there will be exceptions.
>
> Thus, I would phrase it as a strongly suggested guideline rather than a
> hard and fast rule.
>
>
>
>
> On Fri, Jun 13, 2014 at 11:20 AM, Dmitriy Lyubimov <dl...@gmail.com>
> wrote:
>
> > in fact, i'd argue we don't want more than 1 commit per issue -- unless
> > there's a reopening -- and definitely do not want more than 1 commit per
> PR
> >
> >
> > On Fri, Jun 13, 2014 at 11:18 AM, Dmitriy Lyubimov <dl...@gmail.com>
> > wrote:
> >
> > >
> > >
> > >
> > > On Fri, Jun 13, 2014 at 11:14 AM, Ted Dunning <te...@gmail.com>
> > > wrote:
> > >
> > >> I think that rebasing cleanly would help at least as much as
> squashing.
> > >>  Both are probably good.
> > >>
> > >
> > > Rebasing doesn't get rid of intermediate commits, it only gets rid of
> > > merges. which means you will be left with commits like below sitting in
> > > your history anyway as actual commits without clean attribution -- and
> > I'd
> > > argue we don't want that
> > >
> > > * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
> > > |/  Author: pferrel <pa...@occamsmachete.com>
> > > |   Date:   Sat Jun 7 13:36:12 2014 -0700
> > > |
> > > |       added .DS_Store to gitignore for pushes from mac
> > > |
> > >
> > >
> > >
> > >
> >
>

Re: master branch history and Git commits - please DO squash your working branches before merging in

Posted by Ted Dunning <te...@gmail.com>.
I would accept that argument except that there will be exceptions.

Thus, I would phrase it as a strongly suggested guideline rather than a
hard and fast rule.




On Fri, Jun 13, 2014 at 11:20 AM, Dmitriy Lyubimov <dl...@gmail.com>
wrote:

> in fact, i'd argue we don't want more than 1 commit per issue -- unless
> there's a reopening -- and definitely do not want more than 1 commit per PR
>
>
> On Fri, Jun 13, 2014 at 11:18 AM, Dmitriy Lyubimov <dl...@gmail.com>
> wrote:
>
> >
> >
> >
> > On Fri, Jun 13, 2014 at 11:14 AM, Ted Dunning <te...@gmail.com>
> > wrote:
> >
> >> I think that rebasing cleanly would help at least as much as squashing.
> >>  Both are probably good.
> >>
> >
> > Rebasing doesn't get rid of intermediate commits, it only gets rid of
> > merges. which means you will be left with commits like below sitting in
> > your history anyway as actual commits without clean attribution -- and
> I'd
> > argue we don't want that
> >
> > * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
> > |/  Author: pferrel <pa...@occamsmachete.com>
> > |   Date:   Sat Jun 7 13:36:12 2014 -0700
> > |
> > |       added .DS_Store to gitignore for pushes from mac
> > |
> >
> >
> >
> >
>

Re: master branch history and Git commits - please DO squash your working branches before merging in

Posted by Dmitriy Lyubimov <dl...@gmail.com>.
in fact, i'd argue we don't want more than 1 commit per issue -- unless
there's a reopening -- and definitely do not want more than 1 commit per PR


On Fri, Jun 13, 2014 at 11:18 AM, Dmitriy Lyubimov <dl...@gmail.com>
wrote:

>
>
>
> On Fri, Jun 13, 2014 at 11:14 AM, Ted Dunning <te...@gmail.com>
> wrote:
>
>> I think that rebasing cleanly would help at least as much as squashing.
>>  Both are probably good.
>>
>
> Rebasing doesn't get rid of intermediate commits, it only gets rid of
> merges. which means you will be left with commits like below sitting in
> your history anyway as actual commits without clean attribution -- and I'd
> argue we don't want that
>
> * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
> |/  Author: pferrel <pa...@occamsmachete.com>
> |   Date:   Sat Jun 7 13:36:12 2014 -0700
> |
> |       added .DS_Store to gitignore for pushes from mac
> |
>
>
>
>

Re: master branch history and Git commits - please DO squash your working branches before merging in

Posted by Dmitriy Lyubimov <dl...@gmail.com>.
Nope. Once again, i am pushing for one issue -- one commit regardless of
how many commits on a working branch history. Rebasing doesn't eliminate
working branch history, just rewrites it on top of most recent master's.


On Fri, Jun 13, 2014 at 2:25 PM, Ted Dunning <te...@gmail.com> wrote:

> I think we are pushing for the same thing.
>
> If you rebase against master, your changes float above any master commits.
>  Judicious occasional use of interactive rebasing helps make that even more
> true.
>
>
>
> On Fri, Jun 13, 2014 at 11:18 AM, Dmitriy Lyubimov <dl...@gmail.com>
> wrote:
>
> > On Fri, Jun 13, 2014 at 11:14 AM, Ted Dunning <te...@gmail.com>
> > wrote:
> >
> > > I think that rebasing cleanly would help at least as much as squashing.
> > >  Both are probably good.
> > >
> >
> > Rebasing doesn't get rid of intermediate commits, it only gets rid of
> > merges. which means you will be left with commits like below sitting in
> > your history anyway as actual commits without clean attribution -- and
> I'd
> > argue we don't want that
> >
> > * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
> > |/  Author: pferrel <pa...@occamsmachete.com>
> > |   Date:   Sat Jun 7 13:36:12 2014 -0700
> > |
> > |       added .DS_Store to gitignore for pushes from mac
> > |
> >
>

Re: master branch history and Git commits - please DO squash your working branches before merging in

Posted by Ted Dunning <te...@gmail.com>.
I think we are pushing for the same thing.

If you rebase against master, your changes float above any master commits.
 Judicious occasional use of interactive rebasing helps make that even more
true.



On Fri, Jun 13, 2014 at 11:18 AM, Dmitriy Lyubimov <dl...@gmail.com>
wrote:

> On Fri, Jun 13, 2014 at 11:14 AM, Ted Dunning <te...@gmail.com>
> wrote:
>
> > I think that rebasing cleanly would help at least as much as squashing.
> >  Both are probably good.
> >
>
> Rebasing doesn't get rid of intermediate commits, it only gets rid of
> merges. which means you will be left with commits like below sitting in
> your history anyway as actual commits without clean attribution -- and I'd
> argue we don't want that
>
> * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
> |/  Author: pferrel <pa...@occamsmachete.com>
> |   Date:   Sat Jun 7 13:36:12 2014 -0700
> |
> |       added .DS_Store to gitignore for pushes from mac
> |
>

Re: master branch history and Git commits - please DO squash your working branches before merging in

Posted by Dmitriy Lyubimov <dl...@gmail.com>.
On Fri, Jun 13, 2014 at 11:14 AM, Ted Dunning <te...@gmail.com> wrote:

> I think that rebasing cleanly would help at least as much as squashing.
>  Both are probably good.
>

Rebasing doesn't get rid of intermediate commits, it only gets rid of
merges. which means you will be left with commits like below sitting in
your history anyway as actual commits without clean attribution -- and I'd
argue we don't want that

* | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
|/  Author: pferrel <pa...@occamsmachete.com>
|   Date:   Sat Jun 7 13:36:12 2014 -0700
|
|       added .DS_Store to gitignore for pushes from mac
|

Re: master branch history and Git commits - please DO squash your working branches before merging in

Posted by Ted Dunning <te...@gmail.com>.
I think that rebasing cleanly would help at least as much as squashing.
 Both are probably good.

The final commit to master for significant issues should be a contiguous
set of commits, all labeled with the JIRA.  I don't think that having
exactly one commit is necessarily required, but the number shouldn't be
very large at all.




On Fri, Jun 13, 2014 at 11:06 AM, Andrew Musselman <
andrew.musselman@gmail.com> wrote:

> +1
>
>
> On Fri, Jun 13, 2014 at 11:05 AM, Dmitriy Lyubimov <dl...@gmail.com>
> wrote:
>
> > Hi,
> >
> > I would like to suggest to prohibit merges and intermediate commits in
> the
> > master branch. Please   --squash history from the working branch (as
> > defined in PR merge page)!
> >
> > Not squashing working branch history  makes it difficult to (1) attribute
> > intermediate commits to a Mahout issue as not all intermediate commit
> > messages clearly state so; and (2) be able to correct history if needed,
> > with rollbacks.
> >
> > (I do list working branch history in commit description; or, rather, git
> > does it automatically for me, but they are not commits in the master).
> >
> > Bottom line, it is a mess (Pat, i am winking at you :)
> >
> > * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
> > | Author: pferrel <pa...@occamsmachete.com>
> > | Date:   Thu Jun 12 17:45:09 2014 -0700
> > |
> > |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
> > apache/mahout#12
> > |
> > *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
> > |\  Merge: fd7a0bf a8e09cd
> > | | Author: pferrel <pa...@occamsmachete.com>
> > | | Date:   Thu Jun 12 11:33:55 2014 -0700
> > | |
> > | |     Merge branch 'master' of
> > https://git-wip-us.apache.org/repos/asf/mahout
> > | |
> > | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
> > | | Author: ssc <ss...@apache.org>
> > | | Date:   Thu Jun 12 19:03:19 2014 +0200
> > | |
> > | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
> > apache/mahout#16
> > | |
> > * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
> > |\ \  Merge: d319b32 b044a07
> > | |/  Author: pferrel <pa...@occamsmachete.com>
> > | |   Date:   Wed Jun 11 19:17:59 2014 -0700
> > | |
> > | |       Merge branch 'master' of
> > https://git-wip-us.apache.org/repos/asf/mahout
> > | |
> > | * commit b044a07797a8fef23d10f10126615c9b7db659bb
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Tue Jun 10 11:46:32 2014 -0700
> > | |
> > | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
> > | |
> > | |     This closes apache/mahout#15
> > | |
> > | |     Squashed commit of the following:
> > | |
> > | |     commit 0407577bff365028ceef9798d5835f12a81bc941
> > | |     Author: Anand Avati <av...@redhat.com>
> > | |     Date:   Mon Jun 9 22:05:14 2014 -0700
> > | |
> > | |         MAHOUT-1529: spark-shell - cleanup sdc
> > | |
> > | |         Renaming @sc to @sdc has left open the shutdown part. Spark
> > | |         depends on 'implicit sc' to be set by the shell invoker.
> > | |
> > | |           mahout> Stopping spark context.
> > | |           <console>:29: error: not found: value sc
> > | |                         sc.stop()
> > | |                         ^
> > | |
> > | |         So override sparkCleanUp() and call @sdc.stop()
> > | |
> > | |         Signed-off-by: Anand Avati <av...@redhat.com>
> > | |
> > | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Tue Jun 10 11:30:55 2014 -0700
> > | |
> > | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
> > the loaded data
> > | |
> > | |     This closes apache/mahout#10
> > | |
> > | |     Squashed commit of the following:
> > | |
> > | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Tue Jun 10 11:27:38 2014 -0700
> > | |
> > | |         + tests
> > | |
> > | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
> > | |     Merge: 162c5ca 907781b
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Tue Jun 10 11:04:51 2014 -0700
> > | |
> > | |         Merge branch 'master' into MAHOUT-1572
> > | |
> > | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Wed Jun 4 15:10:11 2014 -0700
> > | |
> > | |         initial fix (?)
> > | |
> > | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Tue Jun 10 10:48:55 2014 -0700
> > | |
> > | |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
> > correctly
> > | |
> > | |     This closes apache/mahout#9
> > * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
> > | Author: pferrel <pa...@occamsmachete.com>
> > | Date:   Thu Jun 12 17:45:09 2014 -0700
> > |
> > |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
> > apache/mahout#12
> > |
> > *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
> > |\  Merge: fd7a0bf a8e09cd
> > | | Author: pferrel <pa...@occamsmachete.com>
> > | | Date:   Thu Jun 12 11:33:55 2014 -0700
> > | |
> > | |     Merge branch 'master' of
> > https://git-wip-us.apache.org/repos/asf/mahout
> > | |
> > | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
> > | | Author: ssc <ss...@apache.org>
> > | | Date:   Thu Jun 12 19:03:19 2014 +0200
> > | |
> > | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
> > apache/mahout#16
> > | |
> > * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
> > |\ \  Merge: d319b32 b044a07
> > | |/  Author: pferrel <pa...@occamsmachete.com>
> > | |   Date:   Wed Jun 11 19:17:59 2014 -0700
> > | |
> > | |       Merge branch 'master' of
> > https://git-wip-us.apache.org/repos/asf/mahout
> > | |
> > | * commit b044a07797a8fef23d10f10126615c9b7db659bb
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Tue Jun 10 11:46:32 2014 -0700
> > | |
> > | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
> > | |
> > | |     This closes apache/mahout#15
> > | |
> > | |     Squashed commit of the following:
> > | |
> > | |     commit 0407577bff365028ceef9798d5835f12a81bc941
> > | |     Author: Anand Avati <av...@redhat.com>
> > | |     Date:   Mon Jun 9 22:05:14 2014 -0700
> > | |
> > | |         MAHOUT-1529: spark-shell - cleanup sdc
> > | |
> > | |         Renaming @sc to @sdc has left open the shutdown part. Spark
> > | |         depends on 'implicit sc' to be set by the shell invoker.
> > | |
> > | |           mahout> Stopping spark context.
> > | |           <console>:29: error: not found: value sc
> > | |                         sc.stop()
> > | |                         ^
> > | |
> > | |         So override sparkCleanUp() and call @sdc.stop()
> > | |
> > | |         Signed-off-by: Anand Avati <av...@redhat.com>
> > | |
> > | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Tue Jun 10 11:30:55 2014 -0700
> > | |
> > | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
> > the loaded data
> > | |
> > | |     This closes apache/mahout#10
> > | |
> > | |     Squashed commit of the following:
> > | |
> > | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Tue Jun 10 11:27:38 2014 -0700
> > | |
> > | |         + tests
> > | |
> > | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
> > | |     Merge: 162c5ca 907781b
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Tue Jun 10 11:04:51 2014 -0700
> > | |
> > | |         Merge branch 'master' into MAHOUT-1572
> > | |
> > | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Wed Jun 4 15:10:11 2014 -0700
> > | |
> > | |         initial fix (?)
> > | |
> > | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Tue Jun 10 10:48:55 2014 -0700
> > | |
> > | |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
> > correctly
> > | |
> > | |     This closes apache/mahout#9
> > | |
> > | |     Squashed commit of the following:
> > | |
> > | |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Tue Jun 10 10:46:17 2014 -0700
> > | |
> > | |         Adding test
> > | |
> > | |     commit ef271380e16192b55c31c7b219195d6982587206
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Wed Jun 4 14:43:24 2014 -0700
> > | |
> > | |         initial fix (?)
> > | |
> > | * commit 11046fb5273b559298111b201470d80cd6af43d9
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Mon Jun 9 12:17:00 2014 -0700
> > | |
> > | |     NOJIRA: switching AlS to mahout's random from scala random to
> > ensure deterministic test for the time being.
> > | |
> > * |   commit d319b325066620a82d079379564188912e8b0b92
> > |\ \  Merge: a12135b fcb436d
> > | |/  Author: pferrel <pa...@occamsmachete.com>
> > | |   Date:   Mon Jun 9 07:01:15 2014 -0700
> > | |
> > | |       Merge branch 'master' of
> > https://git-wip-us.apache.org/repos/asf/mahout
> > | |
> > | * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
> > | | Author: Ted Dunning <td...@apache.org>
> > | | Date:   Sun Jun 8 21:18:09 2014 -0700
> > | |
> > | |     MAHOUT-1577 - Restore visibility for getYtransposeY
> > | |
> > | * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
> > | | Author: Ted Dunning <td...@apache.org>
> > | | Date:   Sun Jun 8 20:57:37 2014 -0700
> > | |
> > | |     MAHOUT-1577 - Kill a few more warnings and turn off several (like
> > newline in format string, non-final method call in constructor)
> > | |
> > | * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
> > | | Author: Ted Dunning <td...@apache.org>
> > | | Date:   Sun Jun 8 18:24:48 2014 -0700
> > | |
> > | |     MAHOUT-1576 - Fix several low hanging warnings, the most
> important
> > have to do with over-ridable operations in a constructor
> > | |
> > * |   commit a12135b94002367046ef6edc977527d586026689
> > |\ \  Merge: cc9a70e 99fd9ba
> > | |/  Author: pferrel <pa...@occamsmachete.com>
> > | |   Date:   Sun Jun 8 08:25:36 2014 -0700
> > | |
> > | |       Merge branch 'master' of
> > https://git-wip-us.apache.org/repos/asf/mahout
> > | |
> > | * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
> > | | Author: Ted Dunning <td...@apache.org>
> > | | Date:   Sat Jun 7 15:09:10 2014 -0700
> > | |
> > | |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
> > | |
> > * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
> > |/  Author: pferrel <pa...@occamsmachete.com>
> > |   Date:   Sat Jun 7 13:36:12 2014 -0700
> > |
> > |       added .DS_Store to gitignore for pushes from mac
> > |
> > * commit 63b765abb305cca6d726f54549a92018754a6348
> > * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
> > | Author: pferrel <pa...@occamsmachete.com>
> > | Date:   Thu Jun 12 17:45:09 2014 -0700
> > |
> > |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
> > apache/mahout#12
> > |
> > *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
> > |\  Merge: fd7a0bf a8e09cd
> > | | Author: pferrel <pa...@occamsmachete.com>
> > | | Date:   Thu Jun 12 11:33:55 2014 -0700
> > | |
> > | |     Merge branch 'master' of
> > https://git-wip-us.apache.org/repos/asf/mahout
> > | |
> > | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
> > | | Author: ssc <ss...@apache.org>
> > | | Date:   Thu Jun 12 19:03:19 2014 +0200
> > | |
> > | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
> > apache/mahout#16
> > | |
> > * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
> > |\ \  Merge: d319b32 b044a07
> > | |/  Author: pferrel <pa...@occamsmachete.com>
> > | |   Date:   Wed Jun 11 19:17:59 2014 -0700
> > | |
> > | |       Merge branch 'master' of
> > https://git-wip-us.apache.org/repos/asf/mahout
> > | |
> > | * commit b044a07797a8fef23d10f10126615c9b7db659bb
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Tue Jun 10 11:46:32 2014 -0700
> > | |
> > | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
> > | |
> > | |     This closes apache/mahout#15
> > | |
> > | |     Squashed commit of the following:
> > | |
> > | |     commit 0407577bff365028ceef9798d5835f12a81bc941
> > | |     Author: Anand Avati <av...@redhat.com>
> > | |     Date:   Mon Jun 9 22:05:14 2014 -0700
> > | |
> > | |         MAHOUT-1529: spark-shell - cleanup sdc
> > | |
> > | |         Renaming @sc to @sdc has left open the shutdown part. Spark
> > | |         depends on 'implicit sc' to be set by the shell invoker.
> > | |
> > | |           mahout> Stopping spark context.
> > | |           <console>:29: error: not found: value sc
> > | |                         sc.stop()
> > | |                         ^
> > | |
> > | |         So override sparkCleanUp() and call @sdc.stop()
> > | |
> > | |         Signed-off-by: Anand Avati <av...@redhat.com>
> > | |
> > | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Tue Jun 10 11:30:55 2014 -0700
> > | |
> > | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
> > the loaded data
> > | |
> > | |     This closes apache/mahout#10
> > | |
> > | |     Squashed commit of the following:
> > | |
> > | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Tue Jun 10 11:27:38 2014 -0700
> > | |
> > | |         + tests
> > | |
> > | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
> > | |     Merge: 162c5ca 907781b
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Tue Jun 10 11:04:51 2014 -0700
> > | |
> > | |         Merge branch 'master' into MAHOUT-1572
> > | |
> > | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Wed Jun 4 15:10:11 2014 -0700
> > | |
> > | |         initial fix (?)
> > | |
> > | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Tue Jun 10 10:48:55 2014 -0700
> > | |
> > | |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
> > correctly
> > | |
> > | |     This closes apache/mahout#9
> > | |
> > | |     Squashed commit of the following:
> > | |
> > | |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Tue Jun 10 10:46:17 2014 -0700
> > | |
> > | |         Adding test
> > | |
> > | |     commit ef271380e16192b55c31c7b219195d6982587206
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Wed Jun 4 14:43:24 2014 -0700
> > | |
> > | |         initial fix (?)
> > | |
> > | * commit 11046fb5273b559298111b201470d80cd6af43d9
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Mon Jun 9 12:17:00 2014 -0700
> > | |
> > | |     NOJIRA: switching AlS to mahout's random from scala random to
> > ensure deterministic test for the time being.
> > | |
> > * |   commit d319b325066620a82d079379564188912e8b0b92
> > |\ \  Merge: a12135b fcb436d
> > | |/  Author: pferrel <pa...@occamsmachete.com>
> > | |   Date:   Mon Jun 9 07:01:15 2014 -0700
> > | |
> > | |       Merge branch 'master' of
> > https://git-wip-us.apache.org/repos/asf/mahout
> > | |
> > | * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
> > | | Author: Ted Dunning <td...@apache.org>
> > | | Date:   Sun Jun 8 21:18:09 2014 -0700
> > | |
> > | |     MAHOUT-1577 - Restore visibility for getYtransposeY
> > | |
> > | * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
> > | | Author: Ted Dunning <td...@apache.org>
> > | | Date:   Sun Jun 8 20:57:37 2014 -0700
> > | |
> > | |     MAHOUT-1577 - Kill a few more warnings and turn off several (like
> > newline in format string, non-final method call in constructor)
> > | |
> > | * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
> > | | Author: Ted Dunning <td...@apache.org>
> > | | Date:   Sun Jun 8 18:24:48 2014 -0700
> > | |
> > | |     MAHOUT-1576 - Fix several low hanging warnings, the most
> important
> > have to do with over-ridable operations in a constructor
> > | |
> > * |   commit a12135b94002367046ef6edc977527d586026689
> > |\ \  Merge: cc9a70e 99fd9ba
> > | |/  Author: pferrel <pa...@occamsmachete.com>
> > | |   Date:   Sun Jun 8 08:25:36 2014 -0700
> > | |
> > | |       Merge branch 'master' of
> > https://git-wip-us.apache.org/repos/asf/mahout
> > | |
> > | * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
> > | | Author: Ted Dunning <td...@apache.org>
> > | | Date:   Sat Jun 7 15:09:10 2014 -0700
> > | |
> > | |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
> > | |
> > * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
> > |/  Author: pferrel <pa...@occamsmachete.com>
> > |   Date:   Sat Jun 7 13:36:12 2014 -0700
> > |
> > |       added .DS_Store to gitignore for pushes from mac
> > |
> > * commit 63b765abb305cca6d726f54549a92018754a6348
> > * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
> > | Author: pferrel <pa...@occamsmachete.com>
> > | Date:   Thu Jun 12 17:45:09 2014 -0700
> > |
> > |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
> > apache/mahout#12
> > |
> > *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
> > |\  Merge: fd7a0bf a8e09cd
> > | | Author: pferrel <pa...@occamsmachete.com>
> > | | Date:   Thu Jun 12 11:33:55 2014 -0700
> > | |
> > | |     Merge branch 'master' of
> > https://git-wip-us.apache.org/repos/asf/mahout
> > | |
> > | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
> > | | Author: ssc <ss...@apache.org>
> > | | Date:   Thu Jun 12 19:03:19 2014 +0200
> > | |
> > | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
> > apache/mahout#16
> > | |
> > * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
> > |\ \  Merge: d319b32 b044a07
> > | |/  Author: pferrel <pa...@occamsmachete.com>
> > | |   Date:   Wed Jun 11 19:17:59 2014 -0700
> > | |
> > | |       Merge branch 'master' of
> > https://git-wip-us.apache.org/repos/asf/mahout
> > | |
> > | * commit b044a07797a8fef23d10f10126615c9b7db659bb
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Tue Jun 10 11:46:32 2014 -0700
> > | |
> > | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
> > | |
> > | |     This closes apache/mahout#15
> > | |
> > | |     Squashed commit of the following:
> > | |
> > | |     commit 0407577bff365028ceef9798d5835f12a81bc941
> > | |     Author: Anand Avati <av...@redhat.com>
> > | |     Date:   Mon Jun 9 22:05:14 2014 -0700
> > | |
> > | |         MAHOUT-1529: spark-shell - cleanup sdc
> > | |
> > | |         Renaming @sc to @sdc has left open the shutdown part. Spark
> > | |         depends on 'implicit sc' to be set by the shell invoker.
> > | |
> > | |           mahout> Stopping spark context.
> > | |           <console>:29: error: not found: value sc
> > | |                         sc.stop()
> > | |                         ^
> > | |
> > | |         So override sparkCleanUp() and call @sdc.stop()
> > | |
> > | |         Signed-off-by: Anand Avati <av...@redhat.com>
> > | |
> > | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Tue Jun 10 11:30:55 2014 -0700
> > | |
> > | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
> > the loaded data
> > | |
> > | |     This closes apache/mahout#10
> > | |
> > | |     Squashed commit of the following:
> > | |
> > | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Tue Jun 10 11:27:38 2014 -0700
> > | |
> > | |         + tests
> > | |
> > | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
> > | |     Merge: 162c5ca 907781b
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Tue Jun 10 11:04:51 2014 -0700
> > | |
> > | |         Merge branch 'master' into MAHOUT-1572
> > | |
> > | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Wed Jun 4 15:10:11 2014 -0700
> > | |
> > | |         initial fix (?)
> > | |
> > | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Tue Jun 10 10:48:55 2014 -0700
> > | |
> > | |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
> > correctly
> > | |
> > | |     This closes apache/mahout#9
> > | |
> > | |     Squashed commit of the following:
> > | |
> > | |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Tue Jun 10 10:46:17 2014 -0700
> > | |
> > | |         Adding test
> > | |
> > | |     commit ef271380e16192b55c31c7b219195d6982587206
> > | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> > | |     Date:   Wed Jun 4 14:43:24 2014 -0700
> > | |
> > | |         initial fix (?)
> > | |
> > | * commit 11046fb5273b559298111b201470d80cd6af43d9
> > | | Author: Dmitriy Lyubimov <dl...@apache.org>
> > | | Date:   Mon Jun 9 12:17:00 2014 -0700
> > | |
> > | |     NOJIRA: switching AlS to mahout's random from scala random to
> > ensure deterministic test for the time being.
> > | |
> > * |   commit d319b325066620a82d079379564188912e8b0b92
> > |\ \  Merge: a12135b fcb436d
> > | |/  Author: pferrel <pa...@occamsmachete.com>
> > | |   Date:   Mon Jun 9 07:01:15 2014 -0700
> > | |
> > | |       Merge branch 'master' of
> > https://git-wip-us.apache.org/repos/asf/mahout
> > | |
> > | * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
> > | | Author: Ted Dunning <td...@apache.org>
> > | | Date:   Sun Jun 8 21:18:09 2014 -0700
> > | |
> > | |     MAHOUT-1577 - Restore visibility for getYtransposeY
> > | |
> > | * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
> > | | Author: Ted Dunning <td...@apache.org>
> > | | Date:   Sun Jun 8 20:57:37 2014 -0700
> > | |
> > | |     MAHOUT-1577 - Kill a few more warnings and turn off several (like
> > newline in format string, non-final method call in constructor)
> > | |
> > | * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
> > | | Author: Ted Dunning <td...@apache.org>
> > | | Date:   Sun Jun 8 18:24:48 2014 -0700
> > | |
> > | |     MAHOUT-1576 - Fix several low hanging warnings, the most
> important
> > have to do with over-ridable operations in a constructor
> > | |
> > * |   commit a12135b94002367046ef6edc977527d586026689
> > |\ \  Merge: cc9a70e 99fd9ba
> > | |/  Author: pferrel <pa...@occamsmachete.com>
> > | |   Date:   Sun Jun 8 08:25:36 2014 -0700
> > | |
> > | |       Merge branch 'master' of
> > https://git-wip-us.apache.org/repos/asf/mahout
> > | |
> > | * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
> > | | Author: Ted Dunning <td...@apache.org>
> > | | Date:   Sat Jun 7 15:09:10 2014 -0700
> > | |
> > | |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
> > | |
> > * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
> > |/  Author: pferrel <pa...@occamsmachete.com>
> > |   Date:   Sat Jun 7 13:36:12 2014 -0700
> > |
> >
>

Re: master branch history and Git commits - please DO squash your working branches before merging in

Posted by Andrew Musselman <an...@gmail.com>.
+1


On Fri, Jun 13, 2014 at 11:05 AM, Dmitriy Lyubimov <dl...@gmail.com>
wrote:

> Hi,
>
> I would like to suggest to prohibit merges and intermediate commits in the
> master branch. Please   --squash history from the working branch (as
> defined in PR merge page)!
>
> Not squashing working branch history  makes it difficult to (1) attribute
> intermediate commits to a Mahout issue as not all intermediate commit
> messages clearly state so; and (2) be able to correct history if needed,
> with rollbacks.
>
> (I do list working branch history in commit description; or, rather, git
> does it automatically for me, but they are not commits in the master).
>
> Bottom line, it is a mess (Pat, i am winking at you :)
>
> * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
> | Author: pferrel <pa...@occamsmachete.com>
> | Date:   Thu Jun 12 17:45:09 2014 -0700
> |
> |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
> apache/mahout#12
> |
> *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
> |\  Merge: fd7a0bf a8e09cd
> | | Author: pferrel <pa...@occamsmachete.com>
> | | Date:   Thu Jun 12 11:33:55 2014 -0700
> | |
> | |     Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
> | | Author: ssc <ss...@apache.org>
> | | Date:   Thu Jun 12 19:03:19 2014 +0200
> | |
> | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
> apache/mahout#16
> | |
> * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
> |\ \  Merge: d319b32 b044a07
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Wed Jun 11 19:17:59 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit b044a07797a8fef23d10f10126615c9b7db659bb
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 11:46:32 2014 -0700
> | |
> | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
> | |
> | |     This closes apache/mahout#15
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit 0407577bff365028ceef9798d5835f12a81bc941
> | |     Author: Anand Avati <av...@redhat.com>
> | |     Date:   Mon Jun 9 22:05:14 2014 -0700
> | |
> | |         MAHOUT-1529: spark-shell - cleanup sdc
> | |
> | |         Renaming @sc to @sdc has left open the shutdown part. Spark
> | |         depends on 'implicit sc' to be set by the shell invoker.
> | |
> | |           mahout> Stopping spark context.
> | |           <console>:29: error: not found: value sc
> | |                         sc.stop()
> | |                         ^
> | |
> | |         So override sparkCleanUp() and call @sdc.stop()
> | |
> | |         Signed-off-by: Anand Avati <av...@redhat.com>
> | |
> | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 11:30:55 2014 -0700
> | |
> | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
> the loaded data
> | |
> | |     This closes apache/mahout#10
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 11:27:38 2014 -0700
> | |
> | |         + tests
> | |
> | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
> | |     Merge: 162c5ca 907781b
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 11:04:51 2014 -0700
> | |
> | |         Merge branch 'master' into MAHOUT-1572
> | |
> | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Wed Jun 4 15:10:11 2014 -0700
> | |
> | |         initial fix (?)
> | |
> | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 10:48:55 2014 -0700
> | |
> | |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
> correctly
> | |
> | |     This closes apache/mahout#9
> * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
> | Author: pferrel <pa...@occamsmachete.com>
> | Date:   Thu Jun 12 17:45:09 2014 -0700
> |
> |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
> apache/mahout#12
> |
> *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
> |\  Merge: fd7a0bf a8e09cd
> | | Author: pferrel <pa...@occamsmachete.com>
> | | Date:   Thu Jun 12 11:33:55 2014 -0700
> | |
> | |     Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
> | | Author: ssc <ss...@apache.org>
> | | Date:   Thu Jun 12 19:03:19 2014 +0200
> | |
> | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
> apache/mahout#16
> | |
> * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
> |\ \  Merge: d319b32 b044a07
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Wed Jun 11 19:17:59 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit b044a07797a8fef23d10f10126615c9b7db659bb
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 11:46:32 2014 -0700
> | |
> | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
> | |
> | |     This closes apache/mahout#15
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit 0407577bff365028ceef9798d5835f12a81bc941
> | |     Author: Anand Avati <av...@redhat.com>
> | |     Date:   Mon Jun 9 22:05:14 2014 -0700
> | |
> | |         MAHOUT-1529: spark-shell - cleanup sdc
> | |
> | |         Renaming @sc to @sdc has left open the shutdown part. Spark
> | |         depends on 'implicit sc' to be set by the shell invoker.
> | |
> | |           mahout> Stopping spark context.
> | |           <console>:29: error: not found: value sc
> | |                         sc.stop()
> | |                         ^
> | |
> | |         So override sparkCleanUp() and call @sdc.stop()
> | |
> | |         Signed-off-by: Anand Avati <av...@redhat.com>
> | |
> | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 11:30:55 2014 -0700
> | |
> | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
> the loaded data
> | |
> | |     This closes apache/mahout#10
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 11:27:38 2014 -0700
> | |
> | |         + tests
> | |
> | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
> | |     Merge: 162c5ca 907781b
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 11:04:51 2014 -0700
> | |
> | |         Merge branch 'master' into MAHOUT-1572
> | |
> | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Wed Jun 4 15:10:11 2014 -0700
> | |
> | |         initial fix (?)
> | |
> | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 10:48:55 2014 -0700
> | |
> | |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
> correctly
> | |
> | |     This closes apache/mahout#9
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 10:46:17 2014 -0700
> | |
> | |         Adding test
> | |
> | |     commit ef271380e16192b55c31c7b219195d6982587206
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Wed Jun 4 14:43:24 2014 -0700
> | |
> | |         initial fix (?)
> | |
> | * commit 11046fb5273b559298111b201470d80cd6af43d9
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Mon Jun 9 12:17:00 2014 -0700
> | |
> | |     NOJIRA: switching AlS to mahout's random from scala random to
> ensure deterministic test for the time being.
> | |
> * |   commit d319b325066620a82d079379564188912e8b0b92
> |\ \  Merge: a12135b fcb436d
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Mon Jun 9 07:01:15 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sun Jun 8 21:18:09 2014 -0700
> | |
> | |     MAHOUT-1577 - Restore visibility for getYtransposeY
> | |
> | * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sun Jun 8 20:57:37 2014 -0700
> | |
> | |     MAHOUT-1577 - Kill a few more warnings and turn off several (like
> newline in format string, non-final method call in constructor)
> | |
> | * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sun Jun 8 18:24:48 2014 -0700
> | |
> | |     MAHOUT-1576 - Fix several low hanging warnings, the most important
> have to do with over-ridable operations in a constructor
> | |
> * |   commit a12135b94002367046ef6edc977527d586026689
> |\ \  Merge: cc9a70e 99fd9ba
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Sun Jun 8 08:25:36 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sat Jun 7 15:09:10 2014 -0700
> | |
> | |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
> | |
> * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
> |/  Author: pferrel <pa...@occamsmachete.com>
> |   Date:   Sat Jun 7 13:36:12 2014 -0700
> |
> |       added .DS_Store to gitignore for pushes from mac
> |
> * commit 63b765abb305cca6d726f54549a92018754a6348
> * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
> | Author: pferrel <pa...@occamsmachete.com>
> | Date:   Thu Jun 12 17:45:09 2014 -0700
> |
> |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
> apache/mahout#12
> |
> *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
> |\  Merge: fd7a0bf a8e09cd
> | | Author: pferrel <pa...@occamsmachete.com>
> | | Date:   Thu Jun 12 11:33:55 2014 -0700
> | |
> | |     Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
> | | Author: ssc <ss...@apache.org>
> | | Date:   Thu Jun 12 19:03:19 2014 +0200
> | |
> | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
> apache/mahout#16
> | |
> * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
> |\ \  Merge: d319b32 b044a07
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Wed Jun 11 19:17:59 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit b044a07797a8fef23d10f10126615c9b7db659bb
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 11:46:32 2014 -0700
> | |
> | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
> | |
> | |     This closes apache/mahout#15
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit 0407577bff365028ceef9798d5835f12a81bc941
> | |     Author: Anand Avati <av...@redhat.com>
> | |     Date:   Mon Jun 9 22:05:14 2014 -0700
> | |
> | |         MAHOUT-1529: spark-shell - cleanup sdc
> | |
> | |         Renaming @sc to @sdc has left open the shutdown part. Spark
> | |         depends on 'implicit sc' to be set by the shell invoker.
> | |
> | |           mahout> Stopping spark context.
> | |           <console>:29: error: not found: value sc
> | |                         sc.stop()
> | |                         ^
> | |
> | |         So override sparkCleanUp() and call @sdc.stop()
> | |
> | |         Signed-off-by: Anand Avati <av...@redhat.com>
> | |
> | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 11:30:55 2014 -0700
> | |
> | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
> the loaded data
> | |
> | |     This closes apache/mahout#10
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 11:27:38 2014 -0700
> | |
> | |         + tests
> | |
> | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
> | |     Merge: 162c5ca 907781b
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 11:04:51 2014 -0700
> | |
> | |         Merge branch 'master' into MAHOUT-1572
> | |
> | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Wed Jun 4 15:10:11 2014 -0700
> | |
> | |         initial fix (?)
> | |
> | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 10:48:55 2014 -0700
> | |
> | |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
> correctly
> | |
> | |     This closes apache/mahout#9
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 10:46:17 2014 -0700
> | |
> | |         Adding test
> | |
> | |     commit ef271380e16192b55c31c7b219195d6982587206
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Wed Jun 4 14:43:24 2014 -0700
> | |
> | |         initial fix (?)
> | |
> | * commit 11046fb5273b559298111b201470d80cd6af43d9
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Mon Jun 9 12:17:00 2014 -0700
> | |
> | |     NOJIRA: switching AlS to mahout's random from scala random to
> ensure deterministic test for the time being.
> | |
> * |   commit d319b325066620a82d079379564188912e8b0b92
> |\ \  Merge: a12135b fcb436d
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Mon Jun 9 07:01:15 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sun Jun 8 21:18:09 2014 -0700
> | |
> | |     MAHOUT-1577 - Restore visibility for getYtransposeY
> | |
> | * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sun Jun 8 20:57:37 2014 -0700
> | |
> | |     MAHOUT-1577 - Kill a few more warnings and turn off several (like
> newline in format string, non-final method call in constructor)
> | |
> | * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sun Jun 8 18:24:48 2014 -0700
> | |
> | |     MAHOUT-1576 - Fix several low hanging warnings, the most important
> have to do with over-ridable operations in a constructor
> | |
> * |   commit a12135b94002367046ef6edc977527d586026689
> |\ \  Merge: cc9a70e 99fd9ba
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Sun Jun 8 08:25:36 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sat Jun 7 15:09:10 2014 -0700
> | |
> | |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
> | |
> * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
> |/  Author: pferrel <pa...@occamsmachete.com>
> |   Date:   Sat Jun 7 13:36:12 2014 -0700
> |
> |       added .DS_Store to gitignore for pushes from mac
> |
> * commit 63b765abb305cca6d726f54549a92018754a6348
> * commit c1ca30872c622e513e49fc1bb111bc4b8a527d3b
> | Author: pferrel <pa...@occamsmachete.com>
> | Date:   Thu Jun 12 17:45:09 2014 -0700
> |
> |     MAHOUT-1464 Cooccurrence Analysis on Spark (pat) closes
> apache/mahout#12
> |
> *   commit b77caec6f1c2b9bb48a619a7680c5a5e351579f8
> |\  Merge: fd7a0bf a8e09cd
> | | Author: pferrel <pa...@occamsmachete.com>
> | | Date:   Thu Jun 12 11:33:55 2014 -0700
> | |
> | |     Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit a8e09cd3aa1c9d6fdda2eaf84f86a06a33963658
> | | Author: ssc <ss...@apache.org>
> | | Date:   Thu Jun 12 19:03:19 2014 +0200
> | |
> | |     MAHOUT-1578 Optimizations in matrix serialization (ssc) closes
> apache/mahout#16
> | |
> * |   commit fd7a0bf969e19f069dc97c7d908f9c120c58acdd
> |\ \  Merge: d319b32 b044a07
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Wed Jun 11 19:17:59 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit b044a07797a8fef23d10f10126615c9b7db659bb
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 11:46:32 2014 -0700
> | |
> | |     (NOJIRA) shell -- context cleanup (Anand Avati via dlyubimov)
> | |
> | |     This closes apache/mahout#15
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit 0407577bff365028ceef9798d5835f12a81bc941
> | |     Author: Anand Avati <av...@redhat.com>
> | |     Date:   Mon Jun 9 22:05:14 2014 -0700
> | |
> | |         MAHOUT-1529: spark-shell - cleanup sdc
> | |
> | |         Renaming @sc to @sdc has left open the shutdown part. Spark
> | |         depends on 'implicit sc' to be set by the shell invoker.
> | |
> | |           mahout> Stopping spark context.
> | |           <console>:29: error: not found: value sc
> | |                         sc.stop()
> | |                         ^
> | |
> | |         So override sparkCleanUp() and call @sdc.stop()
> | |
> | |         Signed-off-by: Anand Avati <av...@redhat.com>
> | |
> | * commit 8c529ccff23d419c4cb5191b0435de40d6a9831c
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 11:30:55 2014 -0700
> | |
> | |     MAHOUT-1572: blockify() to detect (naively) the data sparsity in
> the loaded data
> | |
> | |     This closes apache/mahout#10
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit cc93dedcad0b6ff0365f8e15dba280221a0a64f0
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 11:27:38 2014 -0700
> | |
> | |         + tests
> | |
> | |     commit 07180efbfa4472f7d13a2afe1f8f37e18edfe08e
> | |     Merge: 162c5ca 907781b
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 11:04:51 2014 -0700
> | |
> | |         Merge branch 'master' into MAHOUT-1572
> | |
> | |     commit 162c5ca36e00af91a9599075332c577d9b1a13c4
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Wed Jun 4 15:10:11 2014 -0700
> | |
> | |         initial fix (?)
> | |
> | * commit 907781bb856b47cb7b180484c6d4b9f55a6df038
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Tue Jun 10 10:48:55 2014 -0700
> | |
> | |     MAHOUT-1571: Functional Views are not serialized as dense/sparse
> correctly
> | |
> | |     This closes apache/mahout#9
> | |
> | |     Squashed commit of the following:
> | |
> | |     commit 584e2e31e2ac23f75bec0a04e8a7168b8d74577b
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Tue Jun 10 10:46:17 2014 -0700
> | |
> | |         Adding test
> | |
> | |     commit ef271380e16192b55c31c7b219195d6982587206
> | |     Author: Dmitriy Lyubimov <dl...@apache.org>
> | |     Date:   Wed Jun 4 14:43:24 2014 -0700
> | |
> | |         initial fix (?)
> | |
> | * commit 11046fb5273b559298111b201470d80cd6af43d9
> | | Author: Dmitriy Lyubimov <dl...@apache.org>
> | | Date:   Mon Jun 9 12:17:00 2014 -0700
> | |
> | |     NOJIRA: switching AlS to mahout's random from scala random to
> ensure deterministic test for the time being.
> | |
> * |   commit d319b325066620a82d079379564188912e8b0b92
> |\ \  Merge: a12135b fcb436d
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Mon Jun 9 07:01:15 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit fcb436d2a7ed399dd8006b3254e655634000f4a1
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sun Jun 8 21:18:09 2014 -0700
> | |
> | |     MAHOUT-1577 - Restore visibility for getYtransposeY
> | |
> | * commit 8bcaa77340ac377a20237af4efbe891dc5a4790d
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sun Jun 8 20:57:37 2014 -0700
> | |
> | |     MAHOUT-1577 - Kill a few more warnings and turn off several (like
> newline in format string, non-final method call in constructor)
> | |
> | * commit 0844e69d6cbdc7bbfd54ba01dc9c829764eaeb6d
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sun Jun 8 18:24:48 2014 -0700
> | |
> | |     MAHOUT-1576 - Fix several low hanging warnings, the most important
> have to do with over-ridable operations in a constructor
> | |
> * |   commit a12135b94002367046ef6edc977527d586026689
> |\ \  Merge: cc9a70e 99fd9ba
> | |/  Author: pferrel <pa...@occamsmachete.com>
> | |   Date:   Sun Jun 8 08:25:36 2014 -0700
> | |
> | |       Merge branch 'master' of
> https://git-wip-us.apache.org/repos/asf/mahout
> | |
> | * commit 99fd9ba4f9673b2b2d30c2b403aaa294503cc2a2
> | | Author: Ted Dunning <td...@apache.org>
> | | Date:   Sat Jun 7 15:09:10 2014 -0700
> | |
> | |     MAHOUT-1575 - Allow 2 extra passes for conjugate gradient
> | |
> * | commit cc9a70ebbdaceb8d5c2fcecd1a8cd9bee67e323e
> |/  Author: pferrel <pa...@occamsmachete.com>
> |   Date:   Sat Jun 7 13:36:12 2014 -0700
> |
>