[rhq-project/rhq] fe9dc1: [BZ 185375] don't write until we finish reading

[John Sanda]

  Branch: refs/heads/master
  Home:   https://github.com/rhq-project/rhq
  Commit: fe9dc1b2f18e2570d621cb916d7c71f819160d01
      https://github.com/rhq-project/rhq/commit/fe9dc1b2f18e2570d621cb916d7c71f...
  Author: John Sanda <jsanda(a)redhat.com&gt;
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M
modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/MigrateAggregateMetrics.java

  Log Message:
  -----------
  [BZ 185375] don't write until we finish reading

Conflicts:
	modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/MigrateAggregateMetrics.java


  Commit: fbae5167d348ad8c9c91e81f41d66fa476360bb6
      https://github.com/rhq-project/rhq/commit/fbae5167d348ad8c9c91e81f41d66fa...
  Author: John Sanda <jsanda(a)redhat.com&gt;
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M
modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/MigrateAggregateMetrics.java

  Log Message:
  -----------
  [BZ 185375] store rows on fail writes since the result set will be exhausted

Conflicts:
	modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/MigrateAggregateMetrics.java


  Commit: 27fdcf25202d032ebc55934afe626c7f2c803638
      https://github.com/rhq-project/rhq/commit/27fdcf25202d032ebc55934afe626c7...
  Author: John Sanda <jsanda(a)redhat.com&gt;
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M
modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/MigrateAggregateMetrics.java

  Log Message:
  -----------
  [BZ 185375] decrement count when metric has already been migrated


  Commit: 163cd4502bee80c567f4daf1201b4617b8b36e57
      https://github.com/rhq-project/rhq/commit/163cd4502bee80c567f4daf1201b461...
  Author: John Sanda <jsanda(a)redhat.com&gt;
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M
modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/MigrateAggregateMetrics.java

  Log Message:
  -----------
  [BZ 185375] clean up and remove unused code

Conflicts:
	modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/MigrateAggregateMetrics.java


  Commit: 6547ba08434cdab221b886e8fae95ede1f3884c3
      https://github.com/rhq-project/rhq/commit/6547ba08434cdab221b886e8fae95ed...
  Author: John Sanda <jsanda(a)redhat.com&gt;
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    R
modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/MigrateData.java

  Log Message:
  -----------
  [BZ 185375] MigrateData is no longer used

Conflicts:
	modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/MigrateData.java


  Commit: 72f07e8ef06c44d3395e07e830f3080942f60b3a
      https://github.com/rhq-project/rhq/commit/72f07e8ef06c44d3395e07e830f3080...
  Author: John Sanda <jsanda(a)redhat.com&gt;
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M
modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/MigrateAggregateMetrics.java

  Log Message:
  -----------
  [BZ 185375] clean up merge conflicts


Compare: https://github.com/rhq-project/rhq/compare/3de1acc443ac...72f07e8ef06c