Ben Steffensmeier
e6606cb28b
Issue #2574 fix DatabaseQuery conversion of grid coverage objects.
...
Change-Id: I06b98101960775ebe76dcd5d4c4b562f43990309
Former-commit-id: 89de68386a
[formerly fb1480b30d
] [formerly 7e5349bbff
] [formerly cc5d9edc92
[formerly 7e5349bbff
[formerly 33033c354a783ab58d89599eb78355c6b354594f]]]
Former-commit-id: cc5d9edc92
Former-commit-id: 5acc5053cf8a5d78052a11afbf56473f1be1d712 [formerly 23a26f5d4a
]
Former-commit-id: 8a3bbbca50
2013-12-16 14:31:44 -06:00
Richard Peter
609d5ca4b6
Merge "Issue #2170 : Fix PluginNotifier direct-vm endpoints" into omaha_14.2.1
...
Former-commit-id: 66adb4939a
[formerly 42d277364b
] [formerly 3758a9532c
] [formerly 84b64dac81
[formerly 3758a9532c
[formerly 840448d17e58f7d98ebe09b7df17d2d5d4bb4a6f]]]
Former-commit-id: 84b64dac81
Former-commit-id: 87863d83afd45bf114f60dd6dfd2aa25f33d37f8 [formerly f4ba1cac8c
]
Former-commit-id: 9230c9de2a
2013-12-16 13:43:37 -06:00
Richard Peter
bcc4b0226d
Merge "Issue #2613 Replication subscription start time correctly set" into omaha_14.2.1
...
Former-commit-id: 38d9d2fc40
[formerly 8b18800b95
] [formerly 35299e917d
] [formerly 624c51e393
[formerly 35299e917d
[formerly b21de50d989fa341b99c0632e908c6c1f7b6853f]]]
Former-commit-id: 624c51e393
Former-commit-id: bae8a12ce5cd2ad2ea2a1b4df29fdb25a1896deb [formerly c05162ed1a
]
Former-commit-id: d0ef49d66c
2013-12-13 16:09:13 -06:00
Mike Duff
d4008334a7
Issue #2545 - Prevent negatvie values in the BandwidthBucket's current size
...
Former-commit-id: 4a34562b6d
[formerly 685c07cde0
] [formerly b310cf0388
] [formerly eb591030d8
[formerly b310cf0388
[formerly f68aaea220b8ad7dcc886bb3bdeab362b977061e]]]
Former-commit-id: eb591030d8
Former-commit-id: 9481ed3c4c2ed1bd3c5d860228b7afb95c3be678 [formerly 0deef9b6dd
]
Former-commit-id: ee5788ae5f
2013-12-13 16:03:36 -06:00
Benjamin Phillippe
5e71dc4194
Issue #2613 Replication subscription start time correctly set
...
Change-Id: I3d00be2b82282a339c7d13a085abe82ee36850d5
Former-commit-id: c793973916
[formerly dd218bb5e3
] [formerly 70e6212353
] [formerly e0d32db91c
[formerly 70e6212353
[formerly 6f3bc8a63cbd5480d65875815de4cdffa63c266c]]]
Former-commit-id: e0d32db91c
Former-commit-id: 15a4a3cf716b317c2b8a2c64d5fa3e5461da8f2b [formerly 80c01c7117
]
Former-commit-id: accf148cfd
2013-12-13 14:17:11 -06:00
Richard Peter
25033b31dc
Issue #2170 : Fix PluginNotifier direct-vm endpoints
...
Change-Id: If41bfdadbb4bc6ccda3d53f94d1ee493329f0b0c
Former-commit-id: 756baaefb8
[formerly cfd3810476
] [formerly 595a655dfd
] [formerly 6267bee5d5
[formerly 595a655dfd
[formerly b9415039acdc85ee7975e9d6bd27047cce623723]]]
Former-commit-id: 6267bee5d5
Former-commit-id: b7b7dbef9f70f3c75516d4b5ef6990009c01f694 [formerly 55a21685ea
]
Former-commit-id: 21d9a7445d
2013-12-13 12:32:46 -06:00
Lee Venable
df1150692d
Issue #2583 - Procedure dialog fixes and clean up.
...
Change-Id: I9255d9bb21bc8794aacddffe571e62149dd08c10
Former-commit-id: 197a8b5508
[formerly d6eb7534f5
] [formerly aa0e9121f8
] [formerly 7ee6053c22
[formerly aa0e9121f8
[formerly c88681909d99025be43e5d77dd2a89bbc6e929e2]]]
Former-commit-id: 7ee6053c22
Former-commit-id: 0af2a615c742e34adbdfd0a6913eb7d563f108fa [formerly f3c8b69e2e
]
Former-commit-id: d05d650430
2013-12-12 16:15:56 -06:00
Steve Harris
690b177ded
14.1.1-13 baseline
...
Former-commit-id: a2ae393ec1
[formerly 85eebac7e2
] [formerly c88b10039a
] [formerly b0b55a676b
[formerly c88b10039a
[formerly 6eef3022653638f9031a85932d8d551aba5600d2]]]
Former-commit-id: b0b55a676b
Former-commit-id: afbe4db73cf4d0b084a0f0de6518f4b936da3cee [formerly 61d4adc979
]
Former-commit-id: 5368f23247
2013-12-12 16:59:57 -05:00
Richard Peter
c137c98511
Issue #2170 : Add registration of Router to Notification Framework
...
Change-Id: Ib2bc29d82395a021cee3a8f98b894010303f06ad
Former-commit-id: 6b2c2ac57c
[formerly db0e9d40ec
] [formerly 312fcc2b2f
] [formerly ded9c782fc
[formerly 312fcc2b2f
[formerly 6ea46281b904c99c9b6c9f364293bec96be16f7d]]]
Former-commit-id: ded9c782fc
Former-commit-id: 8c2b99ce5979cc67fe016129fe2f3a8f2ec3736d [formerly b4fc76c03a
]
Former-commit-id: 3b4507cbe5
2013-12-12 13:47:37 -06:00
Ben Steffensmeier
6a35407957
Issue #2619 Fix rare dateline bug.
...
Former-commit-id: 1b99b5aca0
[formerly 45e4b4bbad
] [formerly 399c579671
] [formerly 607b5edb69
[formerly 399c579671
[formerly 8231fde4fdcb25ad19e31dd8e4f5716becba347c]]]
Former-commit-id: 607b5edb69
Former-commit-id: fc52d111900f81c3257ff7f1b3c079e152fb00d3 [formerly d0f4b18b78
]
Former-commit-id: 58dabbfc87
2013-12-12 10:30:22 -06:00
Richard Peter
0980aa3328
Merge "Issue #2613 Fixed build" into omaha_14.2.1
...
Former-commit-id: 920fc0cd6c
[formerly 55047d6807
] [formerly ffab0f1669
] [formerly 2f2f755110
[formerly ffab0f1669
[formerly c1630accf918363334c4d558cda8810341d0a2b7]]]
Former-commit-id: 2f2f755110
Former-commit-id: 1381038e1b08db21600d309ac1f9900e2fe8c78c [formerly 4e5cd81df9
]
Former-commit-id: 875d6570ee
2013-12-12 09:54:19 -06:00
Benjamin Phillippe
9d3c42381b
Issue #2613 Fixed build
...
Change-Id: I699c50d3404d155d6435c2ff4f33a465cfd96d14
Former-commit-id: edc39cafac
[formerly 5f3e8a5436
] [formerly 7529f5bbe8
] [formerly 2e909bc207
[formerly 7529f5bbe8
[formerly ce2bffa120b722cb3337658584a83c5161f07a51]]]
Former-commit-id: 2e909bc207
Former-commit-id: 68b4e030b4ac73f474d7331cc758905d41a0b7bd [formerly 620e838f59
]
Former-commit-id: 60d141c6a4
2013-12-12 09:44:05 -06:00
Richard Peter
8c0e800811
Merge "Issue #2566 Update BandwidthGraphDataAdaptor to handle case when there are no reservations." into omaha_14.2.1
...
Former-commit-id: 71d88ca431
[formerly 247eb683e5
] [formerly 91dc7825ce
] [formerly 3cc5ebc43e
[formerly 91dc7825ce
[formerly 08a46b28d5fb5f2e5d28a5f4138ee4fea3fad05d]]]
Former-commit-id: 3cc5ebc43e
Former-commit-id: f3be58dab7723ab7f480a5a91a797293f8455ece [formerly 74c73c8ee1
]
Former-commit-id: 7462693157
2013-12-11 18:00:10 -06:00
Richard Peter
1a34cd0d66
Merge "Issue #2625 - fix no data errors in bandwidth utilization graph remove datauri from RetrievalGeneratorUtilities Set queries for DPA data to query by insertTime rather than obsTime" into omaha_14.2.1
...
Former-commit-id: d4b5572775
[formerly e41adf1ee9
] [formerly 49def8a4b2
] [formerly a0f59f2059
[formerly 49def8a4b2
[formerly 4da283cae33cca8264007e246fa3d02b9809a114]]]
Former-commit-id: a0f59f2059
Former-commit-id: 16027467a25225e85df14eb9f42c3327ad009c45 [formerly 7673b97152
]
Former-commit-id: 9a02a5cf39
2013-12-11 17:59:43 -06:00
Brad Gonzales
d81e245314
Issue #2566 Update BandwidthGraphDataAdaptor to handle case when there are no reservations.
...
Change-Id: Ie9eb7e3e1a5bc8ac4a8ccf9532686d97f584bf1c
Former-commit-id: 1c027db49b
[formerly 6515d6a9e5
] [formerly 112649eff2
] [formerly 96dc3b65b1
[formerly 112649eff2
[formerly 14171c13dd5f127df0b90a5db9a9e11b301ffc5f]]]
Former-commit-id: 96dc3b65b1
Former-commit-id: 0737955a8aef371ea08edc7e3c56b368da7ef030 [formerly 79efc3b53a
]
Former-commit-id: 3f5c25ff46
2013-12-11 17:06:41 -06:00
Richard Peter
eb2ae25b0b
Merge "Issue #2616 - Set overwrite allowed flag on madis records when decoded Added delta script for table MADIS with the hibernate generated key name" into omaha_14.2.1
...
Former-commit-id: ce63ee408b
[formerly f278dad7cc
] [formerly 63bd2b26eb
] [formerly 6f57e14406
[formerly 63bd2b26eb
[formerly 3d887a288459b786718a59d0c4a368408c3419f0]]]
Former-commit-id: 6f57e14406
Former-commit-id: 4d3fe53b50bbff6dffd235bf492f67ac729eea24 [formerly 2f0e43e5a4
]
Former-commit-id: cdf86e65ec
2013-12-11 16:19:02 -06:00
Richard Peter
34f55d6132
Merge "Issue #2613 Registry performance enhancements" into omaha_14.2.1
...
Former-commit-id: cfd32aee5f
[formerly 4ec080e015
] [formerly 375c532376
] [formerly 0ed2ba8024
[formerly 375c532376
[formerly 6a3b2d31829b4f6d39a6a06ec06c901b58506deb]]]
Former-commit-id: 0ed2ba8024
Former-commit-id: 19bf66da69dde6bc681fece6d897e713df539fe5 [formerly 890f038a54
]
Former-commit-id: 1d339f16f5
2013-12-11 16:11:26 -06:00
Richard Peter
c2bb4039df
Merge "Issue #2566 fix bandwidthmanager spring file resource resolution." into omaha_14.2.1
...
Former-commit-id: 02e6e33eb8
[formerly d720fbbd63
] [formerly d9d19a1515
] [formerly 51e46e08c5
[formerly d9d19a1515
[formerly 4ea822a22d2b21b4b3172a1f93773f01c2af20de]]]
Former-commit-id: 51e46e08c5
Former-commit-id: ff7f24a830fce1b40cd26b8492b11dff33299fce [formerly 561706ef1e
]
Former-commit-id: 6dbcd6677c
2013-12-11 16:08:06 -06:00
Mike Duff
1504d28ac8
Issue #2616 - Set overwrite allowed flag on madis records when decoded
...
Added delta script for table MADIS with the hibernate generated key name
Change-Id: Id8cfee5bfba68aa686b9d998bdbf85e5de5c7519
Former-commit-id: fa87393135
[formerly 1a0893d70e
] [formerly 9a02ae7d68
] [formerly 5a42580c2b
[formerly 9a02ae7d68
[formerly b3a18fd5270f2ce109b0560fba6e11e76e721bc9]]]
Former-commit-id: 5a42580c2b
Former-commit-id: 66d528190928112341ed3f56645df5e6a90b4a1e [formerly dc6ab027b5
]
Former-commit-id: d65b7c1cf5
2013-12-11 14:12:05 -06:00
Richard Peter
c8a84d6701
Merge "Issue #2581 remove LSR dataURI column" into omaha_14.2.1
...
Former-commit-id: 453a1072eb
[formerly fcbf2ff270
] [formerly e441b548cc
] [formerly 6e86c98c04
[formerly e441b548cc
[formerly e1e34142baebc23917a975a60f9f45aab750a775]]]
Former-commit-id: 6e86c98c04
Former-commit-id: 499298b5962fa570c04a3e8342f7aa0dc9b0934d [formerly 3ebbced489
]
Former-commit-id: a9e4ee030d
2013-12-11 13:56:38 -06:00
Greg Armendariz
e734c1ea68
Merge "Issue #2622 - Update scripts to query with FILENAMES value, update .spec for version change" into omaha_14.2.1
...
Former-commit-id: 6dcfee182a
[formerly 78e1e9d78f
] [formerly 45c9f7352e
] [formerly 4c1eb198d2
[formerly 45c9f7352e
[formerly 00ef95580fa8ad1fe64694b1bc0a6cdf4ffe6823]]]
Former-commit-id: 4c1eb198d2
Former-commit-id: fdad5044546b55c2852a6891aec138cca46ce41c [formerly 0e0bfc0521
]
Former-commit-id: 5171847cdf
2013-12-11 13:54:17 -06:00
Greg Armendariz
07211ccd00
Issue #2622 - Update scripts to query with FILENAMES value, update .spec for version change
...
Change-Id: I831681915d2e214cf8111faeaabb3176eb3fc3c3
Former-commit-id: 74c49f1eee
[formerly 57c98d4343
] [formerly cb952cdb13
] [formerly 2d2641ea7e
[formerly cb952cdb13
[formerly 584c543fbab59889769570330e7d83529a6b733f]]]
Former-commit-id: 2d2641ea7e
Former-commit-id: 5e9d4ca213ff3e8a2b41e6d180cedfce81e47a93 [formerly f5f21141a4
]
Former-commit-id: fce327c001
2013-12-11 13:46:27 -06:00
Ben Steffensmeier
f62b7011b7
Issue #2602 Switch around the order of some things on startup to make thinclient better.
...
Former-commit-id: c92b5842ab
[formerly bf508b4455
] [formerly a37db9d1b4
] [formerly 922674273e
[formerly a37db9d1b4
[formerly 41f4a0a6050319adf27f3656b665a2fb011b849c]]]
Former-commit-id: 922674273e
Former-commit-id: 7b5206504ecad1e36005120b31bf8d5def0e3bf5 [formerly 4a86c90bfc
]
Former-commit-id: 0fb85fe4aa
2013-12-11 12:45:11 -06:00
Benjamin Phillippe
d794e8efed
Issue #2613 Registry performance enhancements
...
Change-Id: Id50678b2af78adff17fe622201a65d5530e68c21
Former-commit-id: fd4e9edb76
[formerly b2c565c173
] [formerly 969099d4c4
] [formerly 0cb4e61261
[formerly 969099d4c4
[formerly 8d62013d772cf3a15b8f0fa2be7d80955dbfd74d]]]
Former-commit-id: 0cb4e61261
Former-commit-id: a1014b45f1af11aad2b8627651760da5407df827 [formerly 0d98a48d18
]
Former-commit-id: bfa17652ff
2013-12-11 12:20:12 -06:00
Mike Duff
4e87904b6f
Issue #2625 - fix no data errors in bandwidth utilization graph
...
remove datauri from RetrievalGeneratorUtilities
Set queries for DPA data to query by insertTime rather than obsTime
Change-Id: I67a55ca6898a5f478456d75c9ffd7e24120cade7
Former-commit-id: 9f5cf8e0c8
[formerly 4073f048d2
] [formerly d378d9194a
] [formerly 3492436907
[formerly d378d9194a
[formerly 9e37fa3a052d49830b36e6187280615cb6517d47]]]
Former-commit-id: 3492436907
Former-commit-id: 286bba28a76b2a963357edfe7cede7d5247d6b31 [formerly bed189cc7b
]
Former-commit-id: d83734f883
2013-12-11 11:29:38 -06:00
Brad Gonzales
919cea89ce
Issue #2566 fix bandwidthmanager spring file resource resolution.
...
Change-Id: I533b39782454083411c65c3a1f721ca26a0d9731
Former-commit-id: 31930d262d
[formerly 419230d6db
] [formerly 5dd466e22a
] [formerly cfa7128be2
[formerly 5dd466e22a
[formerly c12676830e66cf8e18f10e835c0f95e25074d992]]]
Former-commit-id: cfa7128be2
Former-commit-id: 548da1be7aa44a46bdb6fe06ce610a6d4f4e0449 [formerly 531c598e3b
]
Former-commit-id: 71d6ef856a
2013-12-11 11:19:40 -06:00
Slav Korolev
c1b72b0e10
Issue #2570 . Show All subscriptions in Subscription manager.
...
Former-commit-id: 51c0f8f92f
[formerly 85bc26b5a3
] [formerly b59e9499d2
] [formerly 67e18055cc
[formerly b59e9499d2
[formerly 27e177b2425db0a0241884b18e2501a923d02be4]]]
Former-commit-id: 67e18055cc
Former-commit-id: 9efd61bf39542c3ae92ed81de94a71f51cb52f27 [formerly 6811b0e5c1
]
Former-commit-id: 746157755b
2013-12-11 08:57:13 -05:00
Nate Jensen
61e9833351
Issue #2581 remove LSR dataURI column
...
Change-Id: I9d5ddc8346e6b9ac0ec56d09d50b6b19a5bc682f
Former-commit-id: 1d91d67a5b
[formerly 6188356e72
] [formerly fa674baf89
] [formerly e037c179fe
[formerly fa674baf89
[formerly 88124207249673c3bf29915b6f6318bd2397ecd5]]]
Former-commit-id: e037c179fe
Former-commit-id: d4f63bdd454d528603209bfccf323090b3ffb746 [formerly 34c1af18a7
]
Former-commit-id: 4478983895
2013-12-10 18:27:33 -06:00
Nate Jensen
35331459c0
Merge "Issue #2581 fix decoding of LSR freezing drizzle and latlon" into omaha_14.2.1
...
Former-commit-id: 438f02f87d
[formerly 50e0f15ec8
] [formerly 7d4256d0d6
] [formerly fed233aff3
[formerly 7d4256d0d6
[formerly ae4051f529397b7a8b955bfd6ed56d446235e2a4]]]
Former-commit-id: fed233aff3
Former-commit-id: a498cc41a14dd8a8391736b09aea932d81505907 [formerly befa8a0b9a
]
Former-commit-id: 9cfb911c04
2013-12-10 15:18:27 -06:00
Nate Jensen
c1b164d114
Issue #2581 fix decoding of LSR freezing drizzle and latlon
...
Change-Id: Iec01ce82c1b3104e86a54cd9ec015d699d0703d5
Former-commit-id: 2dc27feedc
[formerly c0c17822c2
] [formerly 60d395b347
] [formerly 16b0650f67
[formerly 60d395b347
[formerly f7324d1e9ab164c553f5c62920292fb0487bfcfb]]]
Former-commit-id: 16b0650f67
Former-commit-id: f03b5f2093b96690ad913f932903aae572e64345 [formerly 36845b1c1d
]
Former-commit-id: c96678bb3a
2013-12-10 10:10:11 -06:00
Mike Duff
24ae26ef90
Issue #2601 - Fix NullPointerException.
...
Former-commit-id: 8b49b1dea7
[formerly 773e546f62
] [formerly 9e9706f55f
] [formerly d2fe42c27c
[formerly 9e9706f55f
[formerly fbeeddbf895ec1568452df632c8147c17757bb0c]]]
Former-commit-id: d2fe42c27c
Former-commit-id: d6664cc0a8ed267b96caf4d313f4f99d96961e7e [formerly 32b468023d
]
Former-commit-id: 02bbd4eaa6
2013-12-10 09:03:42 -06:00
Lee Venable
b342346474
Merge "Issue #2271 - Fix menu problem with previously selected points being selectable again" into omaha_14.2.1
...
Former-commit-id: 77f637dff1
[formerly 997c575919
] [formerly 249435f17c
] [formerly 2c6b4309f0
[formerly 249435f17c
[formerly c4cda041169c5fe3f813a71c1b09b5eaeba9e385]]]
Former-commit-id: 2c6b4309f0
Former-commit-id: 3186e75460a5b4acb8c484648f1f445e432dee15 [formerly cc7885610d
]
Former-commit-id: 4850830125
2013-12-09 09:51:41 -06:00
Richard Peter
799df90f7f
Issue #2170 : Fix Ensemble notifications
...
Change-Id: I48cdd8dad18f0e4866f2e150acb37c8f6ada139b
Former-commit-id: ed79e93d00
[formerly 0c5a6af2f3
] [formerly b3f90b4e07
] [formerly 0c269d0a7c
[formerly b3f90b4e07
[formerly da7c2ba0cdc0e9108d987d9ff7531f657c7c832e]]]
Former-commit-id: 0c269d0a7c
Former-commit-id: e8dec021bb4665162c922437e35f72eea5dd05e6 [formerly d430167b2c
]
Former-commit-id: 4a6d41871e
2013-12-06 15:41:10 -06:00
Mike Duff
5299287b65
Issue #2271 - Fix menu problem with previously selected points being selectable again
...
Change-Id: I8c8a1e7f1f87b87ba6bd065df2692c82f988e8ee
Former-commit-id: e91227bad4
[formerly 850e4dfbde
] [formerly 0a5f2e3484
] [formerly ebc730ac2d
[formerly 0a5f2e3484
[formerly 959fcd37424b6261606d2ae65663403764be9c39]]]
Former-commit-id: ebc730ac2d
Former-commit-id: 10eeac71861238a8de2287ad168fcc62e2afd598 [formerly 4d210517bd
]
Former-commit-id: 1925177772
2013-12-06 12:58:38 -06:00
Nate Jensen
71bc390b4f
Issue #2599 fix constructor
...
Change-Id: I90564c027b23f449181fe46a9d8f2cebddf4d52e
Former-commit-id: 899bc199bb
[formerly ec6b5393ef
] [formerly 9bff38e0d3
] [formerly 41014a105d
[formerly 9bff38e0d3
[formerly 8b0c799cf132a90211d1344d4e16785895f76263]]]
Former-commit-id: 41014a105d
Former-commit-id: 8c75e2081d678b06e6390ca47fa30f36b8fcd47a [formerly f3e455d1a3
]
Former-commit-id: e8f28c6799
2013-12-06 12:35:22 -06:00
Ben Steffensmeier
57de1adb55
Issue #2537 Fix feature for poitndata dependency on dataaccess.
...
Former-commit-id: 258988c269
[formerly 067c510315
] [formerly 59c6a24b68
] [formerly d883f8dbb1
[formerly 59c6a24b68
[formerly 6f3e621fb69e31cc11b6111fdddc702dee29d33f]]]
Former-commit-id: d883f8dbb1
Former-commit-id: 0119ce6ac19df37c80d8dfefa6dbbff1e8a7d526 [formerly 99afa17fd2
]
Former-commit-id: 899cb2628c
2013-12-06 09:14:01 -06:00
Bryan Kowal
0c43ddc19a
Issue #2509 - re-compile grib2.so for RHEL6 64-bit
...
Former-commit-id: e907393567
[formerly 8f053f9fcd
] [formerly 187759698b
] [formerly 5b8a8ddbeb
[formerly 187759698b
[formerly 90958e13e98147130848aad26d077e7a040ddb51]]]
Former-commit-id: 5b8a8ddbeb
Former-commit-id: ce6e7989617ea657c038124ee01c2907330c0e40 [formerly eceffc3880
]
Former-commit-id: ea0243e5da
2013-12-05 15:53:51 -06:00
Brad Gonzales
fa097589d0
Issue #2566 Refactored BandwidthManagerCreators to load spring files using Executor.extractSpringFiles.
...
Amend: Refactored Executor static modes specific methods into a EDEXModesUtil class in
the edex.core.modes package. Move EdexMode, DefaultEdexMode, and EdexModesContainer
to the same package.
Change-Id: Ib6af9557ca8d875c5eff162b46bf56e2c041e0fb
Former-commit-id: 310597d856
[formerly 3d34764022
] [formerly 410a00c72a
] [formerly 72df38075f
[formerly 410a00c72a
[formerly 76a844ed3158bcc80dc0d4b751cad83d39fcbbc4]]]
Former-commit-id: 72df38075f
Former-commit-id: d6d85c281b70c2e07827f44bc42368ab797e8062 [formerly c54fe467a3
]
Former-commit-id: e18f7b2380
2013-12-05 15:17:14 -06:00
Richard Peter
3088533103
Merge "Issue #2545 - Get bandwidth graph data by network" into development
...
Former-commit-id: da82396995
[formerly df4a4c5121
] [formerly d0b50eee3c
] [formerly 6fde307f0a
[formerly d0b50eee3c
[formerly a31695805478d27e072d069d5d3b369001c1d80d]]]
Former-commit-id: 6fde307f0a
Former-commit-id: ab63c3e242c8f489c2b55d427b4ca49dfd7b4657 [formerly 9f4dfc9051
]
Former-commit-id: 45889cb80f
2013-12-05 14:54:46 -06:00
Richard Peter
af583069c4
Issue #2509 : Fix bad merge of DupElimSrv
...
Change-Id: I72702e9943016cd6e00ecc8755222d8de31ee322
Former-commit-id: 3dd79852c5
[formerly 02f48f898f
] [formerly 5286ef0efa
] [formerly 01a8461ec9
[formerly 5286ef0efa
[formerly a266d4007bdb58525942ef406d6fd7a4d269bb8c]]]
Former-commit-id: 01a8461ec9
Former-commit-id: b77fed65aafbc3c1525e24ed1b2eabe0af90b127 [formerly 407fd38c5f
]
Former-commit-id: b91b4913c6
2013-12-05 14:22:25 -06:00
Mike Duff
802e0d360c
Issue #2545 - Get bandwidth graph data by network
...
Change-Id: I4de455a4da43f180ff37eb72370addec77a29314
Former-commit-id: c7345582e9
[formerly a412a19583
] [formerly 4796f43495
] [formerly 0c452e2434
[formerly 4796f43495
[formerly 9102f16c8a6409e92ded498b82a6a4e6a531f2c0]]]
Former-commit-id: 0c452e2434
Former-commit-id: 0a68403f743b2b5033d96fa1433b811164defb55 [formerly 7f2ddb1360
]
Former-commit-id: 45cf9384d8
2013-12-05 13:35:31 -06:00
Richard Peter
7b222f8982
Merge "Issue #1829 Refactored EBXML registry objects" into development
...
Former-commit-id: bf845a6f50
[formerly 0cfe359507
] [formerly bacfa33301
] [formerly 88c866256e
[formerly bacfa33301
[formerly 5f1736746f7594ba0bda3a48083a78ff5ec8d2c9]]]
Former-commit-id: 88c866256e
Former-commit-id: d13b14c1956ab859e5db6a8f3904659a9ce48a78 [formerly 9e64f22e8b
]
Former-commit-id: ba1bd01bca
2013-12-05 13:01:02 -06:00
Nate Jensen
b838267dfc
Merge "Issue #2574 Add spring dependency on gridcoverageLookup for scanGenerator." into development
...
Former-commit-id: 70667c9edc
[formerly 178b2bc3fa
] [formerly 34205de815
] [formerly db25d00dc5
[formerly 34205de815
[formerly 18437fb36f9fff510f526ba40b52c4ec4793e18b]]]
Former-commit-id: db25d00dc5
Former-commit-id: 75746ca49730ca540e2a30e1645ceb7d3dc5b58b [formerly 280325460f
]
Former-commit-id: 8b4f6873a0
2013-12-05 13:00:06 -06:00
Nate Jensen
ad2b7df40b
Merge "Issue #2537 Use PointDataAccessFactory for multiple point data types. Change-Id: I655091f116cde662933ed96d926372a14a435dfc" into development
...
Former-commit-id: 65e20edacf
[formerly b16c88133b
] [formerly c47f6546dd
] [formerly ae0bd2a86f
[formerly c47f6546dd
[formerly 648e5bff2e85d00cf5bcee923f2a137aa76117fc]]]
Former-commit-id: ae0bd2a86f
Former-commit-id: e0720d869c55d2c9da519b9b077f3fd06f02207e [formerly 7163e28d35
]
Former-commit-id: 15fee953f5
2013-12-05 12:59:58 -06:00
Richard Peter
405274c409
Issue #2509 : Fix IFPWE merge issue
...
Change-Id: Ic2a675228f066302eba10e52ba61ea62ab411d75
Former-commit-id: 98d1934501
[formerly 5ad19e32a9
] [formerly de24b8f3df2df8d4f5e956eb80e2cfbe5f61edc6 [formerly 73960ce29a
]] [formerly a8b251223a
[formerly 73960ce29a
[formerly 9450ca459d6b2efdea0d0124a6f9e7100eb5472a]]]
Former-commit-id: a8b251223a
Former-commit-id: 353ea204d786797b9a8d11a6fa8df1eaa4fe8faa [formerly 7bcdabd8dd
]
Former-commit-id: f473851db8
2013-12-05 12:33:51 -06:00
Richard Peter
530b3bd588
Merge branch 'omaha_14.1.1' (14.1.1-11) into development
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs
Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a
Former-commit-id: ba577ff354
[formerly b3b23647b4
] [formerly 0c4ae068ad
] [formerly a0b6ea8bb2
[formerly 0c4ae068ad
[formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: a031ba53197c00cc0956c78c19bfb9d661fb4215 [formerly da027298d4
]
Former-commit-id: 60679a818a
2013-12-05 12:12:27 -06:00
Ben Steffensmeier
8ca3c352c6
Issue #2574 Add spring dependency on gridcoverageLookup for scanGenerator.
...
Former-commit-id: 8746c75023
[formerly 9036774493
] [formerly a567f2af89
] [formerly 3d2439dc31
[formerly a567f2af89
[formerly fb354f5242a3eac4bf3d3c35efef78ed7a7e01f4]]]
Former-commit-id: 3d2439dc31
Former-commit-id: 10d58850c6a7d67b077c8a2f260784bc567fdc56 [formerly a5001016c9
]
Former-commit-id: d1cfb7f9d5
2013-12-05 11:27:29 -06:00
Ben Steffensmeier
6ebc4e5fbc
Issue #2537 Use PointDataAccessFactory for multiple point data types.
...
Change-Id: I655091f116cde662933ed96d926372a14a435dfc
Former-commit-id: 318e48c945
[formerly 7c2a4ef72c
] [formerly 9df4f83a0cf5042c67bf0eccc5635e37d1e149a8 [formerly f682e66e9b
]] [formerly 46a466497c
[formerly f682e66e9b
[formerly 91a3fdbc8bd98603a1cda218729d5542dac809ef]]]
Former-commit-id: 46a466497c
Former-commit-id: a3846ce22f8e198d3cc7cd225b88e3fcecf8d9a7 [formerly ad9fee446d
]
Former-commit-id: fde968a834
2013-12-05 10:54:28 -06:00
Benjamin Phillippe
2165a9059a
Issue #1829 Refactored EBXML registry objects
...
Change-Id: I0f1b2ecbac19cdc2304680d4dbdfb5d963f0649d
Former-commit-id: da4f658b7a
[formerly ed890ce9d9
] [formerly 0b0e70b667
] [formerly ed77440c28
[formerly 0b0e70b667
[formerly 6eb387e69c2fc4837b58f99e4343a745162fb384]]]
Former-commit-id: ed77440c28
Former-commit-id: 30d36d7bd29ad367d12eab6b8c4f863628e42d08 [formerly 7ed6195536
]
Former-commit-id: 7051d10140
2013-12-05 10:20:24 -06:00
Lee Venable
0a9dcb2cc4
Merge "Issue #2592 - Fixed SWT checkbox issue with colored background/foreground." into omaha_14.1.1
...
Former-commit-id: 93a5c3f746
[formerly 67accdb7e3
] [formerly 4f1b663b37
] [formerly b7be687903
[formerly 4f1b663b37
[formerly 1d8f18b5e8a7e932008b8a8baf347f55fcf83e07]]]
Former-commit-id: b7be687903
Former-commit-id: 7f9e4e582c0c271e96b06859da97ccb310d3b7f3 [formerly 3a3333e4ec
]
Former-commit-id: 40dc07e0ff
2013-12-05 08:30:28 -06:00