Commit graph

2043 commits

Author SHA1 Message Date
Qinglu.Lin
119fc9840e ASM #335 - Watch wording not being inserted for SMW and SMW followup
Change-Id: Ic2ab65e3690dccad47b87f99dd4fb9d801742e05

Former-commit-id: 09e90dfe43 [formerly 4b3c821ce0] [formerly 09e90dfe43 [formerly 4b3c821ce0] [formerly af82143e84 [formerly f114aa5e7348f0feb5d9da66b5cd389dfb21275a]]]
Former-commit-id: af82143e84
Former-commit-id: 1b352b8600 [formerly bd7d68bd16]
Former-commit-id: 72b8b32e25
2014-03-17 18:17:49 -04:00
John.McPherson
995015a0ca ASM #209 DR 16362
Change-Id: Ide103349188f12f3b1350bea75f80b225def13e7

Former-commit-id: ea0dc8b3dc [formerly 1d987c36d9] [formerly ea0dc8b3dc [formerly 1d987c36d9] [formerly bbd70c06f1 [formerly b01f04471631f5e2c24dba77f7e96b72444becff]]]
Former-commit-id: bbd70c06f1
Former-commit-id: acf30e83bf [formerly ae671c3601]
Former-commit-id: dbad6b2701
2014-02-24 03:07:21 +00:00
Juliya Dynina
04413ee642 Merge "ASM #118" into asm_14.2.2
Former-commit-id: d9fecf06d2 [formerly 0f5ce6fbde] [formerly d9fecf06d2 [formerly 0f5ce6fbde] [formerly f1a10568d6 [formerly f2354898d0a40ae7a19b4349d25b4204d2da3e4d]]]
Former-commit-id: f1a10568d6
Former-commit-id: 8b164ca292 [formerly a668f336bf]
Former-commit-id: 70d512cb7d
2014-02-20 11:23:32 -05:00
Loubna.Bousaidi
3b94b3b125 ASM #118
Change-Id: I7eee4de29a6aec74b3755951ba60b3c5ec69b769

Former-commit-id: 78f5231cd2 [formerly 5443998332] [formerly 78f5231cd2 [formerly 5443998332] [formerly c7615b9027 [formerly a41751263aeda5020f320ff2e2b4bd96d462300d]]]
Former-commit-id: c7615b9027
Former-commit-id: 7f1b301677 [formerly 0493ce9bc1]
Former-commit-id: 85f0e405f5
2014-02-18 15:41:01 +00:00
Juliya Dynina
6d23cb2729 Merge "ASM #94" into asm_14.2.2
Former-commit-id: 00d8dfb641 [formerly e2479f4075] [formerly 00d8dfb641 [formerly e2479f4075] [formerly 0ae2a064a3 [formerly c2eb6022d788294a87a7878cdac6c325be1c1062]]]
Former-commit-id: 0ae2a064a3
Former-commit-id: d66458b0b0 [formerly 56c383bb73]
Former-commit-id: 3995dee5e1
2014-02-11 10:08:00 -05:00
Michael Gamazaychikov
554c3286a9 ASM #94
Change-Id: I97797a7adbd17532b261987caf2fdcaa1d39c9ed

Former-commit-id: 8cd5cce89e [formerly 42399284ca] [formerly 8cd5cce89e [formerly 42399284ca] [formerly b63053d8b4 [formerly 3c9c34c84ac1cd4962c3e6f877bd33b37aab705a]]]
Former-commit-id: b63053d8b4
Former-commit-id: 293dd963f1 [formerly 60de3bbc43]
Former-commit-id: e5ca7e8740
2014-02-11 01:32:37 +00:00
Kiran.Shrestha
7010235ed1 ASM #97
Change-Id: I4978b7ddba9ec714c4b2635fcb7e926447a3ff13

Former-commit-id: ba857c54d1 [formerly e467e957d7] [formerly ba857c54d1 [formerly e467e957d7] [formerly d54116125c [formerly f4e1de7a38b8a25d735143fb6ffea710bf024c2a]]]
Former-commit-id: d54116125c
Former-commit-id: 65b79616fb [formerly 496181cf92]
Former-commit-id: ca3ad192c3
2014-02-10 19:33:57 +00:00
David Friedman
84b45a2ee0 ASM #240
Change-Id: Ie1e0b115e991c0bdc01e929a21d36a9f1413d940

Former-commit-id: 24ebf8854c [formerly 611503cd96] [formerly 24ebf8854c [formerly 611503cd96] [formerly 969c50b80f [formerly e34ceb8c86f0814c1be7af3bbd2eadec8daf48aa]]]
Former-commit-id: 969c50b80f
Former-commit-id: ecae4f3099 [formerly 8591015dfb]
Former-commit-id: d63a17f725
2014-02-03 19:03:50 +00:00
Michael Gamazaychikov
22b9fe485a ASM #75
Change-Id: If2e1c8bc2d320b3681f64d8637fbabb9659d0c5b

Former-commit-id: 2c2b629206 [formerly 91c3468462] [formerly 2c2b629206 [formerly 91c3468462] [formerly edbadf059e [formerly e726b2a3a2529f5909acb7fe0f9a3b8475f1642e]]]
Former-commit-id: edbadf059e
Former-commit-id: ad27feeedc [formerly e3cb50bdbe]
Former-commit-id: fb6f16fcb5
2014-01-29 14:19:52 -05:00
brian.dyke
ca9263003a merge 14.2.1-3 into asm-14.2.2
Former-commit-id: 4a62e83835 [formerly 2294c81a57] [formerly 4a62e83835 [formerly 2294c81a57] [formerly f10f6d4e8a [formerly a116be206fc8a24dd12610db37db6f26c65a19b0]]]
Former-commit-id: f10f6d4e8a
Former-commit-id: 621464ac0d [formerly e9e2eb3be0]
Former-commit-id: dcf5f25ed1
2014-01-27 15:27:49 -05:00
Ron Anderson
77c132f706 Merge branch 'master_14.1.1' into solutions
Conflicts:
	cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
	cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java

Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5

Former-commit-id: 0bde38cef3 [formerly ba7a25a88f] [formerly 0bde38cef3 [formerly ba7a25a88f] [formerly 62c445d872 [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]]
Former-commit-id: 62c445d872
Former-commit-id: dca7f21f7b [formerly 624375267e]
Former-commit-id: 5076217d8f
2014-01-13 17:45:20 -06:00
Steve Harris
1ca553385c 14.1.1-15 baseline
Former-commit-id: f88ff2bde9 [formerly 8bbd803ace] [formerly f88ff2bde9 [formerly 8bbd803ace] [formerly d8e5799328 [formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]]]
Former-commit-id: d8e5799328
Former-commit-id: 282d10fe6d [formerly 35d8f5a281]
Former-commit-id: cd4a09623c
2014-01-06 14:08:08 -05:00
Steve Harris
5862555160 14.1.1-14 baseline
Former-commit-id: 6df7c67f95 [formerly f2ad9da4eb] [formerly 6df7c67f95 [formerly f2ad9da4eb] [formerly 9ef1c841b9 [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]]]
Former-commit-id: 9ef1c841b9
Former-commit-id: 0989c17710 [formerly 43cc501e0d]
Former-commit-id: a2bdee5cc1
2014-01-06 14:02:30 -05:00
Matthew Howard
4ab75b8cc0 Merge "Issue #234" into master_14.2.1
Former-commit-id: 76690fb1d1 [formerly f0ad72ba4c] [formerly 76690fb1d1 [formerly f0ad72ba4c] [formerly ed53132c4d [formerly 6ac3184c14137a45396eb1b45ed7c6ce4a291b3a]]]
Former-commit-id: ed53132c4d
Former-commit-id: 266ae0249b [formerly 251c8b9b71]
Former-commit-id: 6acc74c85a
2013-12-24 11:41:42 -05:00
Juliya Dynina
961d6b625e Merge "Issue #117" into master_14.2.1
Former-commit-id: 2538556fc3 [formerly 6b5e8c49d9] [formerly 2538556fc3 [formerly 6b5e8c49d9] [formerly 6b7c88469c [formerly 46a6facdf2894434c0787bd9f4b9f9e1cb7cc35f]]]
Former-commit-id: 6b7c88469c
Former-commit-id: ddce2302d3 [formerly 7cbfc0847b]
Former-commit-id: 40ad29baa6
2013-12-23 09:18:36 -05:00
Juliya Dynina
98d57490c2 Merge "Issue #117" into master_14.2.1
Former-commit-id: 8e6c7a1e0c [formerly b83c80c046] [formerly 8e6c7a1e0c [formerly b83c80c046] [formerly 4eef15705b [formerly ff8dcb6aface85849c91bc81f862ea4c382da19d]]]
Former-commit-id: 4eef15705b
Former-commit-id: 6d2643704c [formerly d9572ab14e]
Former-commit-id: 4a97f3edd8
2013-12-23 09:18:22 -05:00
Qinglu.Lin
4a36b4add7 Issue #117
Change-Id: I83e97c43ab9c27a965a9329d5cc4d691c7e20dc2

Former-commit-id: 9eb26957f2 [formerly 6e1dd369a8] [formerly 9eb26957f2 [formerly 6e1dd369a8] [formerly cfc815af76 [formerly c877d3db7b960309def150343672757b59b353a3]]]
Former-commit-id: cfc815af76
Former-commit-id: b3d17992b8 [formerly 3a1e624b72]
Former-commit-id: c1ada67b8c
2013-12-20 14:31:16 -05:00
Qinglu.Lin
2ae0355053 Issue #117
Change-Id: I52293e2148fdc1fbfd22ad01e03d6d628cd1c09a

Former-commit-id: 50732574aa [formerly db66cbb605] [formerly 50732574aa [formerly db66cbb605] [formerly 5dc466443b [formerly 6f197a78afa6a8760f852e94861950a230eaedcc]]]
Former-commit-id: 5dc466443b
Former-commit-id: 66f60fc4a7 [formerly 5026332931]
Former-commit-id: 986593f331
2013-12-20 14:21:54 -05:00
Gang.Zhang
4c6f7e4299 Issue #234
Change-Id: If943dfd5a9c39c57301e8636c1af62d8eaaad4af

Former-commit-id: 67e34f7097 [formerly 5f87120aba] [formerly 67e34f7097 [formerly 5f87120aba] [formerly 51ceba057c [formerly 1c0633daccad7e9f20b444c86fa15fa11cadd0e7]]]
Former-commit-id: 51ceba057c
Former-commit-id: 730bab53a2 [formerly 72e3a9f407]
Former-commit-id: 72e0e8cdb5
2013-12-20 16:00:44 +00:00
Kiran Shrestha
e3bbf2158e Issue #91
Change-Id: I9a6d24e5a186432479cb763ebcf1ad5ba292283e

Former-commit-id: 51e4ca2788 [formerly e2fffcc3bb] [formerly 51e4ca2788 [formerly e2fffcc3bb] [formerly abbc9d74b2 [formerly 7eef26abf692a4ebbadfdc873df21f305f31bc19]]]
Former-commit-id: abbc9d74b2
Former-commit-id: a465bdaa4a [formerly eedef8b1a4]
Former-commit-id: 67b382019f
2013-12-18 19:49:13 +00:00
Richard Peter
1c743d4d44 Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1
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.viz.gfe/GFESuite/ifpIMAGE
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java

Change-Id: Ic1f763baa305eb65f7f5373dea34e01a6373fec7

Former-commit-id: e4f59ea119 [formerly 1de516964b] [formerly e4f59ea119 [formerly 1de516964b] [formerly 2e7fd9ddba [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]]]
Former-commit-id: 2e7fd9ddba
Former-commit-id: 5c0cf804f1 [formerly 62fa535744]
Former-commit-id: 4059813742
2013-12-17 21:04:53 -06:00
Nate Jensen
cd9dec3e57 Merge "Issue #2574 fix DatabaseQuery conversion of grid coverage objects. Change-Id: I06b98101960775ebe76dcd5d4c4b562f43990309" into omaha_14.2.1
Former-commit-id: 29425906ba [formerly 66f5000243] [formerly 29425906ba [formerly 66f5000243] [formerly 84e3cf0988 [formerly 69cbbcc3c88565c35c1453412f031669306adf0f]]]
Former-commit-id: 84e3cf0988
Former-commit-id: eee649c9b1 [formerly 42bd8ccde4]
Former-commit-id: 3141f76bff
2013-12-17 12:20:37 -06:00
Brad Gonzales
f71ea9eeb4 Issue #2636 fixes for the scheduling gaps in the middle of subscription schedules.
Amend: Added max checks to prevent negative bucket sizes in RetrievalPlan remove methods.  Wrapped debug logging in is debug on checks.

Change-Id: I5ab6d3c103e82bf2b1aa0eaf167f0993e5778c90

Former-commit-id: 253cc9df80 [formerly cc75442fa3] [formerly 253cc9df80 [formerly cc75442fa3] [formerly b2b352a5ae [formerly 3db5d79b914436b8d0feed600fc586d7d3884706]]]
Former-commit-id: b2b352a5ae
Former-commit-id: 6e78d3a521 [formerly 0df42dacfd]
Former-commit-id: 4f6b8a79bb
2013-12-17 11:57:06 -06:00
Brad Gonzales
b12fc921a5 Issue #2635 Remove unneeded retrieval plan plan for sbn data on the wfo.
Change-Id: Icb4ce20d0fa5c8bfc8af90020bbdcade0c396168

Former-commit-id: d329fc26bb [formerly d324400d65] [formerly d329fc26bb [formerly d324400d65] [formerly d0ae47d053 [formerly f4c1739687685a22847a09490724e84825032146]]]
Former-commit-id: d0ae47d053
Former-commit-id: 729ab5d41e [formerly 8476a13e41]
Former-commit-id: f0f1abea6b
2013-12-17 09:43:12 -06:00
Bryan Kowal
fad82481c1 Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf
Amend: wrap file access in try..finally; move StringBuilder outside of a loop

Change-Id: Iafa7493ef79a0a891f36923f1695cefdb47e16da

Former-commit-id: 0c3b22c8f2 [formerly 43008f4698] [formerly 0c3b22c8f2 [formerly 43008f4698] [formerly 120ebd045a [formerly 71f74d7b8125994537ef5520fe59134a7f86e9af]]]
Former-commit-id: 120ebd045a
Former-commit-id: 68181d3f62 [formerly fac9d72cc8]
Former-commit-id: 9e0e6662c8
2013-12-16 16:39:10 -06:00
Ben Steffensmeier
ca5fb7e3fa Issue #2574 fix DatabaseQuery conversion of grid coverage objects.
Change-Id: I06b98101960775ebe76dcd5d4c4b562f43990309

Former-commit-id: fb1480b30d [formerly 7e5349bbff] [formerly fb1480b30d [formerly 7e5349bbff] [formerly cc5d9edc92 [formerly 33033c354a783ab58d89599eb78355c6b354594f]]]
Former-commit-id: cc5d9edc92
Former-commit-id: 8a3bbbca50 [formerly 23a26f5d4a]
Former-commit-id: 9f30c14fca
2013-12-16 14:31:44 -06:00
Richard Peter
4bd12a5840 Merge "Issue #2170: Fix PluginNotifier direct-vm endpoints" into omaha_14.2.1
Former-commit-id: 42d277364b [formerly 3758a9532c] [formerly 42d277364b [formerly 3758a9532c] [formerly 84b64dac81 [formerly 840448d17e58f7d98ebe09b7df17d2d5d4bb4a6f]]]
Former-commit-id: 84b64dac81
Former-commit-id: 9230c9de2a [formerly f4ba1cac8c]
Former-commit-id: fcd5955a0f
2013-12-16 13:43:37 -06:00
Richard Peter
27716cb2fe Merge "Issue #2613 Replication subscription start time correctly set" into omaha_14.2.1
Former-commit-id: 8b18800b95 [formerly 35299e917d] [formerly 8b18800b95 [formerly 35299e917d] [formerly 624c51e393 [formerly b21de50d989fa341b99c0632e908c6c1f7b6853f]]]
Former-commit-id: 624c51e393
Former-commit-id: d0ef49d66c [formerly c05162ed1a]
Former-commit-id: 7125f2eca0
2013-12-13 16:09:13 -06:00
Mike Duff
d8787f7eba Issue #2545 - Prevent negatvie values in the BandwidthBucket's current size
Former-commit-id: 685c07cde0 [formerly b310cf0388] [formerly 685c07cde0 [formerly b310cf0388] [formerly eb591030d8 [formerly f68aaea220b8ad7dcc886bb3bdeab362b977061e]]]
Former-commit-id: eb591030d8
Former-commit-id: ee5788ae5f [formerly 0deef9b6dd]
Former-commit-id: 4127267b78
2013-12-13 16:03:36 -06:00
Benjamin Phillippe
822603235c Issue #2613 Replication subscription start time correctly set
Change-Id: I3d00be2b82282a339c7d13a085abe82ee36850d5

Former-commit-id: dd218bb5e3 [formerly 70e6212353] [formerly dd218bb5e3 [formerly 70e6212353] [formerly e0d32db91c [formerly 6f3bc8a63cbd5480d65875815de4cdffa63c266c]]]
Former-commit-id: e0d32db91c
Former-commit-id: accf148cfd [formerly 80c01c7117]
Former-commit-id: 7d1f693fd9
2013-12-13 14:17:11 -06:00
Richard Peter
84d7393161 Issue #2170: Fix PluginNotifier direct-vm endpoints
Change-Id: If41bfdadbb4bc6ccda3d53f94d1ee493329f0b0c

Former-commit-id: cfd3810476 [formerly 595a655dfd] [formerly cfd3810476 [formerly 595a655dfd] [formerly 6267bee5d5 [formerly b9415039acdc85ee7975e9d6bd27047cce623723]]]
Former-commit-id: 6267bee5d5
Former-commit-id: 21d9a7445d [formerly 55a21685ea]
Former-commit-id: 689a74ec89
2013-12-13 12:32:46 -06:00
Steve Harris
800136d61b 14.1.1-13 baseline
Former-commit-id: 85eebac7e2 [formerly c88b10039a] [formerly 85eebac7e2 [formerly c88b10039a] [formerly b0b55a676b [formerly 6eef3022653638f9031a85932d8d551aba5600d2]]]
Former-commit-id: b0b55a676b
Former-commit-id: 5368f23247 [formerly 61d4adc979]
Former-commit-id: ff08301890
2013-12-12 16:59:57 -05:00
Richard Peter
d357b534c4 Issue #2170: Add registration of Router to Notification Framework
Change-Id: Ib2bc29d82395a021cee3a8f98b894010303f06ad

Former-commit-id: db0e9d40ec [formerly 312fcc2b2f] [formerly db0e9d40ec [formerly 312fcc2b2f] [formerly ded9c782fc [formerly 6ea46281b904c99c9b6c9f364293bec96be16f7d]]]
Former-commit-id: ded9c782fc
Former-commit-id: 3b4507cbe5 [formerly b4fc76c03a]
Former-commit-id: 3543625506
2013-12-12 13:47:37 -06:00
Ben Steffensmeier
463ad8e8fa Issue #2619 Fix rare dateline bug.
Former-commit-id: 45e4b4bbad [formerly 399c579671] [formerly 45e4b4bbad [formerly 399c579671] [formerly 607b5edb69 [formerly 8231fde4fdcb25ad19e31dd8e4f5716becba347c]]]
Former-commit-id: 607b5edb69
Former-commit-id: 58dabbfc87 [formerly d0f4b18b78]
Former-commit-id: a92f15a8fa
2013-12-12 10:30:22 -06:00
Richard Peter
455dfbcdeb Merge "Issue #2613 Fixed build" into omaha_14.2.1
Former-commit-id: 55047d6807 [formerly ffab0f1669] [formerly 55047d6807 [formerly ffab0f1669] [formerly 2f2f755110 [formerly c1630accf918363334c4d558cda8810341d0a2b7]]]
Former-commit-id: 2f2f755110
Former-commit-id: 875d6570ee [formerly 4e5cd81df9]
Former-commit-id: d0fbf8df6b
2013-12-12 09:54:19 -06:00
Benjamin Phillippe
e54629a36e Issue #2613 Fixed build
Change-Id: I699c50d3404d155d6435c2ff4f33a465cfd96d14

Former-commit-id: 5f3e8a5436 [formerly 7529f5bbe8] [formerly 5f3e8a5436 [formerly 7529f5bbe8] [formerly 2e909bc207 [formerly ce2bffa120b722cb3337658584a83c5161f07a51]]]
Former-commit-id: 2e909bc207
Former-commit-id: 60d141c6a4 [formerly 620e838f59]
Former-commit-id: b960d13fd8
2013-12-12 09:44:05 -06:00
Richard Peter
ff074484f5 Merge "Issue #2566 Update BandwidthGraphDataAdaptor to handle case when there are no reservations." into omaha_14.2.1
Former-commit-id: 247eb683e5 [formerly 91dc7825ce] [formerly 247eb683e5 [formerly 91dc7825ce] [formerly 3cc5ebc43e [formerly 08a46b28d5fb5f2e5d28a5f4138ee4fea3fad05d]]]
Former-commit-id: 3cc5ebc43e
Former-commit-id: 7462693157 [formerly 74c73c8ee1]
Former-commit-id: e4af4c8b58
2013-12-11 18:00:10 -06:00
Richard Peter
59ee3a6432 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: e41adf1ee9 [formerly 49def8a4b2] [formerly e41adf1ee9 [formerly 49def8a4b2] [formerly a0f59f2059 [formerly 4da283cae33cca8264007e246fa3d02b9809a114]]]
Former-commit-id: a0f59f2059
Former-commit-id: 9a02a5cf39 [formerly 7673b97152]
Former-commit-id: 022ee8929e
2013-12-11 17:59:43 -06:00
Brad Gonzales
7d479d8a73 Issue #2566 Update BandwidthGraphDataAdaptor to handle case when there are no reservations.
Change-Id: Ie9eb7e3e1a5bc8ac4a8ccf9532686d97f584bf1c

Former-commit-id: 6515d6a9e5 [formerly 112649eff2] [formerly 6515d6a9e5 [formerly 112649eff2] [formerly 96dc3b65b1 [formerly 14171c13dd5f127df0b90a5db9a9e11b301ffc5f]]]
Former-commit-id: 96dc3b65b1
Former-commit-id: 3f5c25ff46 [formerly 79efc3b53a]
Former-commit-id: 133918fba6
2013-12-11 17:06:41 -06:00
Richard Peter
b3074e9215 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: f278dad7cc [formerly 63bd2b26eb] [formerly f278dad7cc [formerly 63bd2b26eb] [formerly 6f57e14406 [formerly 3d887a288459b786718a59d0c4a368408c3419f0]]]
Former-commit-id: 6f57e14406
Former-commit-id: cdf86e65ec [formerly 2f0e43e5a4]
Former-commit-id: fb3ccd066c
2013-12-11 16:19:02 -06:00
Richard Peter
ff66c6d1e5 Merge "Issue #2613 Registry performance enhancements" into omaha_14.2.1
Former-commit-id: 4ec080e015 [formerly 375c532376] [formerly 4ec080e015 [formerly 375c532376] [formerly 0ed2ba8024 [formerly 6a3b2d31829b4f6d39a6a06ec06c901b58506deb]]]
Former-commit-id: 0ed2ba8024
Former-commit-id: 1d339f16f5 [formerly 890f038a54]
Former-commit-id: 1c5dc1b952
2013-12-11 16:11:26 -06:00
Richard Peter
333ee2bbab Merge "Issue #2566 fix bandwidthmanager spring file resource resolution." into omaha_14.2.1
Former-commit-id: d720fbbd63 [formerly d9d19a1515] [formerly d720fbbd63 [formerly d9d19a1515] [formerly 51e46e08c5 [formerly 4ea822a22d2b21b4b3172a1f93773f01c2af20de]]]
Former-commit-id: 51e46e08c5
Former-commit-id: 6dbcd6677c [formerly 561706ef1e]
Former-commit-id: 7788a51f89
2013-12-11 16:08:06 -06:00
shooper
1e6f73b1f4 Issue #219
Change-Id: I77aae849959a7629ec8128536d570a3f21bc5eb3

Former-commit-id: 9f23fcba01 [formerly 310a5f238f] [formerly 9f23fcba01 [formerly 310a5f238f] [formerly 721ddcc203 [formerly f03684d97044a5eb53e954236fb90669f70ec174]]]
Former-commit-id: 721ddcc203
Former-commit-id: 4557d11d1a [formerly 3c9a7777a4]
Former-commit-id: fef533ed2b
2013-12-11 16:25:33 -05:00
Mike Duff
00e00796ae 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: 1a0893d70e [formerly 9a02ae7d68] [formerly 1a0893d70e [formerly 9a02ae7d68] [formerly 5a42580c2b [formerly b3a18fd5270f2ce109b0560fba6e11e76e721bc9]]]
Former-commit-id: 5a42580c2b
Former-commit-id: d65b7c1cf5 [formerly dc6ab027b5]
Former-commit-id: 3f98d329c9
2013-12-11 14:12:05 -06:00
Benjamin Phillippe
c330390a76 Issue #2613 Registry performance enhancements
Change-Id: Id50678b2af78adff17fe622201a65d5530e68c21

Former-commit-id: b2c565c173 [formerly 969099d4c4] [formerly b2c565c173 [formerly 969099d4c4] [formerly 0cb4e61261 [formerly 8d62013d772cf3a15b8f0fa2be7d80955dbfd74d]]]
Former-commit-id: 0cb4e61261
Former-commit-id: bfa17652ff [formerly 0d98a48d18]
Former-commit-id: 61b206a82e
2013-12-11 12:20:12 -06:00
Mike Duff
671e43a228 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: 4073f048d2 [formerly d378d9194a] [formerly 4073f048d2 [formerly d378d9194a] [formerly 3492436907 [formerly 9e37fa3a052d49830b36e6187280615cb6517d47]]]
Former-commit-id: 3492436907
Former-commit-id: d83734f883 [formerly bed189cc7b]
Former-commit-id: 35def598bd
2013-12-11 11:29:38 -06:00
Brad Gonzales
ee8cbe414c Issue #2566 fix bandwidthmanager spring file resource resolution.
Change-Id: I533b39782454083411c65c3a1f721ca26a0d9731

Former-commit-id: 419230d6db [formerly 5dd466e22a] [formerly 419230d6db [formerly 5dd466e22a] [formerly cfa7128be2 [formerly c12676830e66cf8e18f10e835c0f95e25074d992]]]
Former-commit-id: cfa7128be2
Former-commit-id: 71d6ef856a [formerly 531c598e3b]
Former-commit-id: dbd7f3cc37
2013-12-11 11:19:40 -06:00
Nate Jensen
e548e47239 Issue #2581 remove LSR dataURI column
Change-Id: I9d5ddc8346e6b9ac0ec56d09d50b6b19a5bc682f

Former-commit-id: 6188356e72 [formerly fa674baf89] [formerly 6188356e72 [formerly fa674baf89] [formerly e037c179fe [formerly 88124207249673c3bf29915b6f6318bd2397ecd5]]]
Former-commit-id: e037c179fe
Former-commit-id: 4478983895 [formerly 34c1af18a7]
Former-commit-id: b5450572f2
2013-12-10 18:27:33 -06:00
Nate Jensen
34319cc97e Issue #2581 fix decoding of LSR freezing drizzle and latlon
Change-Id: Iec01ce82c1b3104e86a54cd9ec015d699d0703d5

Former-commit-id: c0c17822c2 [formerly 60d395b347] [formerly c0c17822c2 [formerly 60d395b347] [formerly 16b0650f67 [formerly f7324d1e9ab164c553f5c62920292fb0487bfcfb]]]
Former-commit-id: 16b0650f67
Former-commit-id: c96678bb3a [formerly 36845b1c1d]
Former-commit-id: 6b9ef6eddd
2013-12-10 10:10:11 -06:00
Richard Peter
5283e7c725 Issue #2170: Fix Ensemble notifications
Change-Id: I48cdd8dad18f0e4866f2e150acb37c8f6ada139b

Former-commit-id: 0c5a6af2f3 [formerly b3f90b4e07] [formerly 0c5a6af2f3 [formerly b3f90b4e07] [formerly 0c269d0a7c [formerly da7c2ba0cdc0e9108d987d9ff7531f657c7c832e]]]
Former-commit-id: 0c269d0a7c
Former-commit-id: 4a6d41871e [formerly d430167b2c]
Former-commit-id: 3376002d20
2013-12-06 15:41:10 -06:00