Commit graph

243 commits

Author SHA1 Message Date
Dustin Johnson
76907bd13d Merge "Issue #1786 - Modify status handler to log to default handler if PlatformUI is not up. Peer review comments" into omaha_13.4.1
Former-commit-id: db353e6f2d [formerly eb096536b3] [formerly c2cdafa265] [formerly db353e6f2d [formerly eb096536b3] [formerly c2cdafa265] [formerly f6a63050a1 [formerly c2cdafa265 [formerly 4adb0045f3a22d9b07e2cca5630feebc78981492]]]]
Former-commit-id: f6a63050a1
Former-commit-id: ed715e30ab [formerly c6c0e2cd5a] [formerly cbf95d970036e37b651dbe1c823a64c4fd2e0459 [formerly f2e4d0c743]]
Former-commit-id: 9ab46fc38dbce126f080f70d9a270564d1ce9f7c [formerly b526eaadc8]
Former-commit-id: cc23ed1760
2013-04-17 13:03:16 -05:00
Mike Duff
ea920be92f Issue #1786 - Modify status handler to log to default handler if PlatformUI is not up.
Peer review comments

Change-Id: Idf195398fdfcf7f52abf0ce203b048c3ac1186cb

Former-commit-id: 13ab57916e [formerly 0935bc3e30] [formerly 1f80f38e8a] [formerly 13ab57916e [formerly 0935bc3e30] [formerly 1f80f38e8a] [formerly 866e27825f [formerly 1f80f38e8a [formerly dbdfc33769f7b179f9f4a3a2a2f9d509facb78d8]]]]
Former-commit-id: 866e27825f
Former-commit-id: 0f1f46b7fa [formerly e1e3449c71] [formerly e54fad69d6eabd08572e0f49ae8a05e83994c713 [formerly 17d3ed8fde]]
Former-commit-id: 7ccc204f41c35004cfc7fb3de6b5c45c78cc3390 [formerly 61c9dde6d0]
Former-commit-id: 9ff19270a5
2013-04-17 10:48:25 -05:00
Bryan Kowal
ad6f08881b Issue #1859 - the Xss JVM parameter will now be included in the ini files for the 32-bit CAVE
Former-commit-id: 3ce54b57bf [formerly 3ac089fbf8] [formerly 0a92ecca56] [formerly 3ce54b57bf [formerly 3ac089fbf8] [formerly 0a92ecca56] [formerly a2cd90e16a [formerly 0a92ecca56 [formerly 43f7cd079a103ad11d21a903438aac5736d88654]]]]
Former-commit-id: a2cd90e16a
Former-commit-id: 3d3978671a [formerly 2f4b108057] [formerly c2f6ca580b63c3a27433272e519e77d2f90aa042 [formerly 74ba9ebc3f]]
Former-commit-id: b596fbc17046fee12a16eb3e8b0d6b949d814d8b [formerly 15af31e90f]
Former-commit-id: 69c1d4c465
2013-04-16 17:01:45 -05:00
Richard Peter
02428a03c0 Merge "Issue #1787 Fixed to support changes to D2D grid location" into omaha_13.4.1
Former-commit-id: 244e7ab8da [formerly 30e77171ab] [formerly 390bf03c39] [formerly 244e7ab8da [formerly 30e77171ab] [formerly 390bf03c39] [formerly 5a11d3cc1c [formerly 390bf03c39 [formerly 73e3a04a98ced3670c61b5debacdfc79d494ab29]]]]
Former-commit-id: 5a11d3cc1c
Former-commit-id: 865883a366 [formerly 4ed90bf67a] [formerly d87a04feb7e6045446d19ab85351d3ff8bbcfc93 [formerly 6be394ba64]]
Former-commit-id: 34fb3acaa8ea91a8bc7f1711b794a9c11e20ef9e [formerly d2354e13ec]
Former-commit-id: e4c7161748
2013-04-16 09:35:12 -05:00
Ron Anderson
c0f2c84b19 Issue #1787 Fixed to support changes to D2D grid location
Change-Id: I9ba8a45cf5b4f1ada6eaf1390f922bc5560d6e5c

Former-commit-id: f0e2bf8755 [formerly 4ea01a29ce] [formerly c233ce042d] [formerly f0e2bf8755 [formerly 4ea01a29ce] [formerly c233ce042d] [formerly 4cd87f2726 [formerly c233ce042d [formerly 5a15d9add4f47cb2016bbd453008039cef8f765f]]]]
Former-commit-id: 4cd87f2726
Former-commit-id: f10107fef4 [formerly 24a6a3590f] [formerly c8230f228e91a9f3155cde9baf0651765c522e16 [formerly e9f674a575]]
Former-commit-id: f8d56d18af251880f893a19b401fdc01b452c187 [formerly 89a2d99bfe]
Former-commit-id: 4dd37ae7cd
2013-04-15 18:02:47 -05:00
Dave Hladky
99d0c3901c Issue #1890 moved date keys to references in FFMPRecord instead of hard object in FFMPBasin
Change-Id: I840e0805422686856744f0d39dda0aeac4755bb8

Former-commit-id: bb6814beef [formerly c52445652a] [formerly 60fa768195] [formerly bb6814beef [formerly c52445652a] [formerly 60fa768195] [formerly 978e68d893 [formerly 60fa768195 [formerly 4c1e41a6a77ea89f2a0c0253671b8d6cca071c04]]]]
Former-commit-id: 978e68d893
Former-commit-id: 1ca77b427f [formerly d0ec4f0d87] [formerly c72d0a748e1272940a038261a3b8315e8fd1eeee [formerly 5789936212]]
Former-commit-id: a2225196ae722fa9348d20acb31f2d406f2af39b [formerly 0f7843f0b7]
Former-commit-id: 14a08d6f66
2013-04-15 17:58:06 -05:00
Lee Venable
99bf297190 Merge "Issue #1902 - FFMP permormance/cleanup peer review comments" into omaha_13.4.1
Former-commit-id: c23b6d31d5 [formerly 9ae56e2172] [formerly 8723d88a19] [formerly c23b6d31d5 [formerly 9ae56e2172] [formerly 8723d88a19] [formerly 8c8709f4a6 [formerly 8723d88a19 [formerly 042819679ba8e0d22695b41059772da841619f29]]]]
Former-commit-id: 8c8709f4a6
Former-commit-id: 953d3f79fb [formerly b18fa4f6bf] [formerly 3ebd30bd68f66548fee71c2096f5598c7cdba3aa [formerly 1674a59ed3]]
Former-commit-id: b694b850da12576a75b20bb91bfeb2f285ef290a [formerly ec3f0c0a11]
Former-commit-id: 783df0394c
2013-04-15 15:33:53 -05:00
Mike Duff
c53f202b19 Issue #1902 - FFMP permormance/cleanup
peer review comments

Change-Id: Id0c238906a1189c9c88e3dc99aa0a60cbfa00a15

Former-commit-id: dc8e37c0df [formerly 8271eaf328] [formerly 020713663a] [formerly dc8e37c0df [formerly 8271eaf328] [formerly 020713663a] [formerly 85f1aba297 [formerly 020713663a [formerly 15b28d081af503387ed1c350f4ec23258c41d68f]]]]
Former-commit-id: 85f1aba297
Former-commit-id: 41b00b0d6d [formerly 7a1809afca] [formerly 3c48d99b3e2289bad30a4264bbe35a37469181cf [formerly f61bae1c3e]]
Former-commit-id: 4b99fb61085242237b0321d02bcd5fb3d32fea55 [formerly 812599d8db]
Former-commit-id: feb9fc93ef
2013-04-15 09:40:07 -05:00
Steve Harris
0d89c11bf1 Merge branch 'master_13.3.1' into omaha_13.4.1
Former-commit-id: bc46b3803f [formerly 97790b0d3e] [formerly 6dc19411c1] [formerly bc46b3803f [formerly 97790b0d3e] [formerly 6dc19411c1] [formerly bdefa9f20f [formerly 6dc19411c1 [formerly cb0c44c44331d64e566905a166abf132f6a5817b]]]]
Former-commit-id: bdefa9f20f
Former-commit-id: c425411d92 [formerly a6ccaf52d4] [formerly 8c3599e7ee240df84defae2bc7978ccea1279afd [formerly 85bebd026e]]
Former-commit-id: 8f17443f179dc02a6109a68f0452c0dbc8b41a4e [formerly 7144ec32e9]
Former-commit-id: b446c96698
2013-04-15 09:37:29 -05:00
Steve Harris
99d89adc2e 13.3.1-20 baseline
Former-commit-id: 9e73c3f1ed [formerly 07f7e6e2b4] [formerly 25432cc388] [formerly 9e73c3f1ed [formerly 07f7e6e2b4] [formerly 25432cc388] [formerly 446bec6f49 [formerly 25432cc388 [formerly 91210030e50e7a19c3d8d4c9d377494de2bc83dd]]]]
Former-commit-id: 446bec6f49
Former-commit-id: 1749ff8a3c [formerly 8535bceb4c] [formerly 48c43f807cd6cab814e5d057a67effdc5c9ea638 [formerly 4b71131386]]
Former-commit-id: 03e22585dd1936fc2af32023a5ae3b65d4f222f9 [formerly 44cd8d47fb]
Former-commit-id: 953ffdab87
2013-04-15 08:58:59 -05:00
Roger Ferrel
1d036eb29c Issue #1735 Speed ups for AcarsSoundingRecords and conversion to ThriftClient in MonitorDataUtil.
Change-Id: Iaa88a15c0406bf5b0c9ffeb5af7f31701be226a9

Former-commit-id: 04ab641171 [formerly 1258e12e11] [formerly 842852d975] [formerly 04ab641171 [formerly 1258e12e11] [formerly 842852d975] [formerly 4c15be46a0 [formerly 842852d975 [formerly 7cf9c217010a260281480eccdcc4e0b8d83fcd1f]]]]
Former-commit-id: 4c15be46a0
Former-commit-id: a8534ec26f [formerly 0b7d85a43f] [formerly 7701c00608738698fe5760f22807ef2cffec9b97 [formerly e3bacfb9f0]]
Former-commit-id: c26b591296e8b58697fbaeae88fdab31fbcd248d [formerly 94c372088d]
Former-commit-id: 5a6926dfa3
2013-04-12 11:10:13 -05:00
Steve Harris
23ba5b6690 Issue #1872 - Merge branch 'master_13.3.1' (13.3.1-19) into omaha_13.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/src/com/raytheon/uf/common/dataplugin/binlightning/BinLightningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/CWATRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/PrecipRateRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/QPFRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/RadarRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/ScanRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/VILRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/src/gov/noaa/nws/ncep/common/dataplugin/ncpirep/NcPirepRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncscd/src/gov/noaa/nws/ncep/common/dataplugin/ncscd/NcScdRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java

Former-commit-id: 58848dbf11 [formerly 0d86b95f1b] [formerly 55d9909d6d] [formerly 58848dbf11 [formerly 0d86b95f1b] [formerly 55d9909d6d] [formerly 0fed14d765 [formerly 55d9909d6d [formerly 6dced3d81d2733f9f7c5f3d54cb123bf8ba055b2]]]]
Former-commit-id: 0fed14d765
Former-commit-id: 6f691692bb [formerly 55dda49d47] [formerly 9971801ff7675d72352d78bac25edb59dd4b1b9c [formerly fe6a078c64]]
Former-commit-id: 55c3e4f9cc9b0427394c00bf35baeeaf592f669f [formerly a9d3e94b3b]
Former-commit-id: 98fd30b0d5
2013-04-11 13:14:00 -05:00
Dave Hladky
4b22280cf7 Issue #1886 double pfaf in mouseover text
Change-Id: I4f89aede6985126cfda5491b6df5bc4e18f34362

Former-commit-id: dc91e88853 [formerly ed0afbec22] [formerly 7c1e2eddbc] [formerly dc91e88853 [formerly ed0afbec22] [formerly 7c1e2eddbc] [formerly 53fbf8815e [formerly 7c1e2eddbc [formerly e1d484049e276877ef4327b5fbd8d722e1eda20c]]]]
Former-commit-id: 53fbf8815e
Former-commit-id: cbec86f7c1 [formerly 18b34a2b16] [formerly 894251a20da8c03e9af9f8f74719957d93e09ae1 [formerly 8e1e4bb5f0]]
Former-commit-id: 921961dc4e0f0d6aeab6aad9d5508e0fdc1f28ec [formerly cca803dac3]
Former-commit-id: 2adea3bb0a
2013-04-11 09:06:03 -05:00
Ron Anderson
d46d0869ea Issue #1854 Fix for compatibility with PostGIS 2.0
Change-Id: I5b6ff34c823302b8db466d8e27130904bf4b82c3

Former-commit-id: d0124941cf [formerly f8a20529d7] [formerly dd10f6799b] [formerly d0124941cf [formerly f8a20529d7] [formerly dd10f6799b] [formerly fcacf03de0 [formerly dd10f6799b [formerly 06158e2d3486770e0aeda370f12e49356d15d440]]]]
Former-commit-id: fcacf03de0
Former-commit-id: 6af53d70a7 [formerly 73588e3289] [formerly 9543294906c83b93e7f6d2c401190b0148820cb7 [formerly 59990c15cf]]
Former-commit-id: 49dfe3ccc6580e5930907dc69bdf1ced8fdee91a [formerly 01edd8acd2]
Former-commit-id: 976c6ac8e2
2013-04-10 15:57:05 -05:00
Nate Jensen
e84f6e3448 Merge "Issue #1896 Make FFMPResource work better with D2D time matcher." into omaha_13.4.1
Former-commit-id: f02d3d2d67 [formerly 1825e7a4fc] [formerly 2e6f8d874e] [formerly f02d3d2d67 [formerly 1825e7a4fc] [formerly 2e6f8d874e] [formerly e6c7729470 [formerly 2e6f8d874e [formerly db2d869900335634e9976370b7154baad4415ab2]]]]
Former-commit-id: e6c7729470
Former-commit-id: 336ad702de [formerly 099d6055e1] [formerly f98ac70d72af6e4ba7d74ca3304afd3ccebed7aa [formerly 9ee54a18f7]]
Former-commit-id: 3cda992e407887a3811338ec06cd478262520937 [formerly ccae7d873f]
Former-commit-id: 9c0aab26eb
2013-04-10 14:57:43 -05:00
Ben Steffensmeier
2e5abaeb44 Issue #1896 Make FFMPResource work better with D2D time matcher.
Former-commit-id: c328c1ad8d [formerly 2fc12b739b] [formerly 6637ae7c0e] [formerly c328c1ad8d [formerly 2fc12b739b] [formerly 6637ae7c0e] [formerly f58e1fe7b4 [formerly 6637ae7c0e [formerly 8253598d2f19321c86a1d2da2a6b634a5ae7cd31]]]]
Former-commit-id: f58e1fe7b4
Former-commit-id: 1632a12679 [formerly 0b740cc760] [formerly 92ece9a38841fc7ff5df4245e11d0a654983ba6c [formerly c321a387fc]]
Former-commit-id: 5ecdd6f6df917a5528cdef5b984b8ef20eacdc96 [formerly ec5daf4cb0]
Former-commit-id: 88e24c35ef
2013-04-10 14:30:50 -05:00
Mike Duff
835be943a0 Issue #1786 - Initial checkin of https for thin client
Code review comments

Change-Id: I1fde9a276ecca44d87603be08a99232a5d7b441e

Former-commit-id: 60a6fb451c [formerly f584e17aa7] [formerly b9abbcdf37] [formerly 60a6fb451c [formerly f584e17aa7] [formerly b9abbcdf37] [formerly 0a33734e6f [formerly b9abbcdf37 [formerly 6f206dad8ffbbd7b793b92b8a23bbce74a5b0017]]]]
Former-commit-id: 0a33734e6f
Former-commit-id: 173c3e105a [formerly 080bb15b65] [formerly 2be236391b1c5cf5192a6941173792def17ad162 [formerly fd55f6ed42]]
Former-commit-id: 3a8401fb2e96b573816c64579acf4a752d3fa080 [formerly c1a7a62e5b]
Former-commit-id: 657bb56bf0
2013-04-10 10:29:33 -05:00
Steve Harris
b6db7821fa 13.3.1-19 baseline
Former-commit-id: 196767d525 [formerly dc9fef33a9] [formerly 9be238bcc4] [formerly 196767d525 [formerly dc9fef33a9] [formerly 9be238bcc4] [formerly abaf9f12f9 [formerly 9be238bcc4 [formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]]]]
Former-commit-id: abaf9f12f9
Former-commit-id: fe5020d315 [formerly ed4150db5f] [formerly afa8971d2a4b49801835997c9e04d909cbb5917c [formerly 340a2cfb23]]
Former-commit-id: 8178539bb83f1e27afa01a5dd82705a3f18fc420 [formerly 7d76371536]
Former-commit-id: 7b7efd0bd1
2013-04-09 08:37:12 -05:00
Bryan Kowal
155c0efbef Issue #1293 - remove hdffileid and create delta script to update existing databases
- now in the 13.4.1 branch


Former-commit-id: 885dd56459 [formerly e92e2712da] [formerly 4cc9a742c8] [formerly 885dd56459 [formerly e92e2712da] [formerly 4cc9a742c8] [formerly c08190a586 [formerly 4cc9a742c8 [formerly f58fa2c5360cdbf38580bb675d2acdc8cb6b438e]]]]
Former-commit-id: c08190a586
Former-commit-id: ea86a8ba59 [formerly eea02ee972] [formerly 0bd4d2c02ecc3f80e814b1c7593bcf9ddb429c21 [formerly 55f234c2d1]]
Former-commit-id: c0b00876a3491930673c6dd9710f08611caea242 [formerly 7bfabf4a4e]
Former-commit-id: 4f8d471c5e
2013-04-08 14:04:05 -05:00
Dustin Johnson
ef062dc2a2 Issue #1872 Fix compile errors
Change-Id: Ic70a61c30bbe8ff4768a8079beb5be5f9336876a

Former-commit-id: ff6f1dc67a [formerly ec85cdcf8c] [formerly 7cf482512d] [formerly ff6f1dc67a [formerly ec85cdcf8c] [formerly 7cf482512d] [formerly 06e6d84273 [formerly 7cf482512d [formerly 2b84d1a58c99858784294bf32b293f8a54c38ecd]]]]
Former-commit-id: 06e6d84273
Former-commit-id: ba666a0216 [formerly 9531e50cac] [formerly 59856ee7614cee35d409908965a9a266ed5ee207 [formerly add67ae3dc]]
Former-commit-id: 9cc05353119d0dc071ed85a0d3b14dc1ff4ab10d [formerly 64b2560d05]
Former-commit-id: bf97f2e7d2
2013-04-04 16:44:57 -05:00
Roger Ferrel
34010df840 Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned.
Change reviewer comments.

Change-Id: Ida69b63198ffa5c229eedd3abb42c4f5f9e1d00d

Former-commit-id: 50ffd4082b [formerly 90dae591a6] [formerly 998714524d] [formerly 50ffd4082b [formerly 90dae591a6] [formerly 998714524d] [formerly b00d64ec0a [formerly 998714524d [formerly 882f96509c19f0621a4f6e6806e3177f6c566562]]]]
Former-commit-id: b00d64ec0a
Former-commit-id: ef8461965e [formerly 5c4a938c72] [formerly 3ba9851638529124c64d3eb3b31a74ca7dd0db71 [formerly 8c5f3fb8f7]]
Former-commit-id: af45db73b891a4a828963709b4fdc2c7e21c4347 [formerly da4b43a4fc]
Former-commit-id: 59bb22e52b
2013-04-04 13:22:10 -05:00
Max Schenkelberg
509942bffc Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development.
Change-Id: I37c3135794c991e2405d556823a22768dd491f00

Conflicts:

	cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/rsc/VIIRSDataCallback.java


Former-commit-id: a5994b8983 [formerly be574276f9] [formerly 6d0960c4ef] [formerly a5994b8983 [formerly be574276f9] [formerly 6d0960c4ef] [formerly b042037a67 [formerly 6d0960c4ef [formerly ed981dc2487d169a502f7396520899fc55ff3299]]]]
Former-commit-id: b042037a67
Former-commit-id: c8e0d2ca98 [formerly fb1a6e203b] [formerly 79c9f6bf695445a8d8715c158cdad1b211214ced [formerly 1b81c79b13]]
Former-commit-id: b54658d12950068a772a67b068d99d660f27a3a9 [formerly 95e73c34f9]
Former-commit-id: 61f17d8d34
2013-04-04 13:21:35 -05:00
Mike Duff
5ab90cb5d7 Issue #1830 - Don't allow base level config files for FFMP
Change-Id: Ib408e51eda5367a1d66684685935b6163acbbb77

Former-commit-id: b96f951732 [formerly 57146e3c95] [formerly 42fa10a859] [formerly b96f951732 [formerly 57146e3c95] [formerly 42fa10a859] [formerly 15c4f53172 [formerly 42fa10a859 [formerly 33f7392176acf8da158f309451557edd677c7805]]]]
Former-commit-id: 15c4f53172
Former-commit-id: 54c3173f69 [formerly c2e22945f6] [formerly e9f2c7d68b92623b0e477d83de8068a69aeaec7f [formerly dd5dc7f0d2]]
Former-commit-id: eb9a48baca6c961a50713deaf1e80fa3e3f06c2a [formerly f7d644f051]
Former-commit-id: f159af03fa
2013-04-04 13:20:28 -05:00
Roger Ferrel
257c281c0a Issue #1735 Performance improvments for LLWSData.
Change-Id: I146250873a90e1a7378a3e910416e03b6d3bf17f

Former-commit-id: 23d3ab925d [formerly f6ccec22b0] [formerly 0b224e9b84] [formerly 23d3ab925d [formerly f6ccec22b0] [formerly 0b224e9b84] [formerly 54daec6dc6 [formerly 0b224e9b84 [formerly 55230d49b580be00dcd092c80dca3ee7e37563c3]]]]
Former-commit-id: 54daec6dc6
Former-commit-id: 3ba7a255df [formerly 57bc235dbd] [formerly a2309ab886cfb5a81042406997df735ce9256a80 [formerly d49314c184]]
Former-commit-id: 680e5c049c0ff58c0b92a81cac87cca56752c2a0 [formerly 321b0dd55d]
Former-commit-id: 7538be4d80
2013-04-04 13:11:59 -05:00
Dustin Johnson
7dbb9acf53 Issue #1815 Move DD phase3 code to 5-Data_Delivery
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425

Conflicts:

	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.uf.viz.feature.alertviz/feature.xml
	edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.ogc.common/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/DefaultLayerCollector.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerCollector.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerHolder.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerTransformer.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/SimpleDimension.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/SimpleLayer.java
	edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/res/spring/grib-dpa-ingest.xml
	edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/src/com/raytheon/uf/edex/plugin/grib/ogc/GribLayerCollector.java
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/build.properties
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/res/spring/obs-datadelivery.xml
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/res/spring/obs-dpa-ingest.xml
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/src/com/raytheon/uf/edex/plugin/obs/ogc/metar/MetarLayerCollector.java
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/src/com/raytheon/uf/edex/plugin/obs/ogc/metar/feature/Metar.java
	edexOsgi/com.raytheon.uf.edex.topo/src/com/raytheon/uf/edex/topo/StatusConstants.java
	edexOsgi/com.raytheon.uf.edex.wcs/src/com/raytheon/uf/edex/wcs/reg/DefaultWcsSource.java
	edexOsgi/com.raytheon.uf.edex.wms/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.wms/src/com/raytheon/uf/edex/wms/reg/DefaultWmsSource.java
	edexOsgi/com.raytheon.uf.edex.wms/src/com/raytheon/uf/edex/wms/styling/ColormapStyleProvider.java
	edexOsgi/com.raytheon.uf.edex.wms/src/com/raytheon/uf/edex/wms/util/ColorMapUtility.java


Former-commit-id: af4da9286b [formerly dbeffa91fe] [formerly 375f0801a2] [formerly af4da9286b [formerly dbeffa91fe] [formerly 375f0801a2] [formerly 3c41127c42 [formerly 375f0801a2 [formerly 0b38c35370237a6215bb2eba9347de9b9f0a7ea1]]]]
Former-commit-id: 3c41127c42
Former-commit-id: 94002b3be9 [formerly 9a4f4431de] [formerly 1aa6cc2e6bc2ae28b658d5879fe7eb65cc4a7b70 [formerly 0dc74710ce]]
Former-commit-id: 3bc02ea1c6075b3b5e6394a15bdba67e6052ad17 [formerly 32da016541]
Former-commit-id: ce87841d63
2013-04-04 13:10:24 -05:00
Bryan Kowal
2e44b94d90 Issue #1805 - slightly modified viz feature build order
Change-Id: I39da0557224a06f4d945ec496c8381bcf0197569

Former-commit-id: 685123f51d [formerly 40dd190ecf] [formerly 40a4b38929] [formerly 685123f51d [formerly 40dd190ecf] [formerly 40a4b38929] [formerly 8187df486a [formerly 40a4b38929 [formerly 7e6ffbe4447fcaf13cae49d16038d5edfa0cdfec]]]]
Former-commit-id: 8187df486a
Former-commit-id: 710c23bd4c [formerly ee25f748c1] [formerly c293c242989b735cdbe96bb812cb793e886d8b66 [formerly 3c70c5be2b]]
Former-commit-id: c17a8b30aeb42b31b523837e93f89089e0c8b74b [formerly d8fded4a65]
Former-commit-id: 20774becca
2013-04-04 13:02:49 -05:00
Steve Harris
0cd73a41a1 13.3.1-18 baseline
Former-commit-id: e621424fcb [formerly f3e79bcc9d] [formerly a2b098d86d] [formerly e621424fcb [formerly f3e79bcc9d] [formerly a2b098d86d] [formerly ce6a06a7e3 [formerly a2b098d86d [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]]]
Former-commit-id: ce6a06a7e3
Former-commit-id: a196ebc11b [formerly 0edd049e3b] [formerly 6155a83f5aa46637b96708a2e4492a382c4e5e79 [formerly bf6c3b6762]]
Former-commit-id: 88c12203c6853385a029c2fa9c3bdc8048aff152 [formerly 044912d48b]
Former-commit-id: fc009792e3
2013-04-03 14:58:29 -05:00
Steve Harris
fd3b082c54 13.3.1-17 baseline
Former-commit-id: 1b8e623c9b [formerly f28b85d42f] [formerly 7bf9966dcb] [formerly 1b8e623c9b [formerly f28b85d42f] [formerly 7bf9966dcb] [formerly a3fe998f8f [formerly 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]]]
Former-commit-id: a3fe998f8f
Former-commit-id: a6ff543f88 [formerly ef413da5f7] [formerly 4f7db3036276e18944f4e769d33a7d819e6ace34 [formerly 4afa41d4e7]]
Former-commit-id: aceedb117eb5695a6155a52973b981de9bb6252a [formerly 50becef97f]
Former-commit-id: a112803c98
2013-04-01 12:04:56 -05:00
Steve Harris
b739c58290 13.3.1-16 baseline
Former-commit-id: 712c13a655 [formerly a262f22cee] [formerly 51380726d4] [formerly 712c13a655 [formerly a262f22cee] [formerly 51380726d4] [formerly 3066dd33e5 [formerly 51380726d4 [formerly 18321f88c2efedf141b84e7de18c200e1037f740]]]]
Former-commit-id: 3066dd33e5
Former-commit-id: 994aab5c6a [formerly 6b75202d07] [formerly 4ee75d69123e11d9ab2091fbd33d33a09b414210 [formerly 36a4b3eb51]]
Former-commit-id: 19e2f3972eced86532b7883214738f39cc0c8612 [formerly c53a305b1e]
Former-commit-id: e61c718b49
2013-04-01 11:39:08 -05:00
Steve Harris
622caf8d93 13.3.1-15 baseline
Former-commit-id: 70fece2da1 [formerly 4cf3ad6abb] [formerly eb1dab3864] [formerly 70fece2da1 [formerly 4cf3ad6abb] [formerly eb1dab3864] [formerly 3d8ed484be [formerly eb1dab3864 [formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]]]
Former-commit-id: 3d8ed484be
Former-commit-id: 4df1b4aeae [formerly 2bf790aae3] [formerly 2a3aaa1bdc7787d9eb37d0e30bdab63d5e6f4495 [formerly d3cec5d3cb]]
Former-commit-id: 2638b93048c278492c5ba927b77742ee53322508 [formerly 4204273f21]
Former-commit-id: cc1ef45545
2013-04-01 11:33:20 -05:00
Steve Harris
43942dad11 13.3.1-14 baseline
Former-commit-id: f9b3430485 [formerly 91a5e4578e] [formerly 9022c500ce] [formerly f9b3430485 [formerly 91a5e4578e] [formerly 9022c500ce] [formerly 9fba973fd0 [formerly 9022c500ce [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]]]
Former-commit-id: 9fba973fd0
Former-commit-id: 3cbf22bd96 [formerly 936e4adda2] [formerly 38d1148d2eae21bb316bf579672305ceffd84c1c [formerly 2ca160caf0]]
Former-commit-id: 8c6b23e522a402fa4cd1e6df150e646e4689e3b0 [formerly 8237fdadaa]
Former-commit-id: f59f1f02b0
2013-03-27 17:59:34 -05:00
Steve Harris
a33631faa5 13.3.1-13 baseline
Former-commit-id: 0f2ebb8f10 [formerly 792171756f] [formerly c77a452f5a] [formerly 0f2ebb8f10 [formerly 792171756f] [formerly c77a452f5a] [formerly c65f3e68e5 [formerly c77a452f5a [formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]]]]
Former-commit-id: c65f3e68e5
Former-commit-id: b49c1b0fa8 [formerly 4f2e9aec0d] [formerly 24c9dcc4807f8692b6eb63ba5946c346d7126d11 [formerly 822d05a709]]
Former-commit-id: 3a3a2fa20a832cb9027d27e82dc69e0c20123169 [formerly 7aa4f7b265]
Former-commit-id: 25a851cccf
2013-03-26 12:43:07 -05:00
Steve Harris
fd735b8ff8 13.3.1-12 baseline
Former-commit-id: 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly aaac0b51e5 [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]]
Former-commit-id: aaac0b51e5
Former-commit-id: bb30a41300 [formerly f80f98cee2] [formerly 4cfa5d11d7d7059b88534daa18142d24f3a6f481 [formerly bc439aee4f]]
Former-commit-id: 5c941816ce99cd7acc86ec8198a9c8d060f02007 [formerly f1d156779a]
Former-commit-id: 120fc26670
2013-03-25 13:27:13 -05:00
Steve Harris
1261f1dbf9 13.3.1-10 baseline
Former-commit-id: 76ea9120d8 [formerly 57f4676b6c] [formerly 073687d9a9] [formerly 76ea9120d8 [formerly 57f4676b6c] [formerly 073687d9a9] [formerly 7078eec1b1 [formerly 073687d9a9 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]]]
Former-commit-id: 7078eec1b1
Former-commit-id: dbeb388d72 [formerly e9f0328808] [formerly 023f42cbdef7d2df7347dbb273b58245adbc07be [formerly 7c2e617d26]]
Former-commit-id: a425f5b8a103c063bd8067c0d4a3f1cbedcd8f01 [formerly f2cc967a4f]
Former-commit-id: e6ab10cc26
2013-03-20 15:53:01 -05:00
Steve Harris
5411621351 13.3.1-9 baseline
Former-commit-id: 6ebecda008 [formerly c7b2ef2d8c] [formerly 468ae82305] [formerly 6ebecda008 [formerly c7b2ef2d8c] [formerly 468ae82305] [formerly f2b3fddfe2 [formerly 468ae82305 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]]]]
Former-commit-id: f2b3fddfe2
Former-commit-id: 3c492badbc [formerly 7e96d841d9] [formerly 3bbb9bbab1edbb030bd2a4d290990d7cda8a756f [formerly 0375805e79]]
Former-commit-id: e83406d2275f6117c72406e8ae7298dd5995a819 [formerly 65f522fc87]
Former-commit-id: 37beeaab69
2013-03-19 14:22:56 -05:00
Steve Harris
0b0c5e4bec 13.3.1-8 baseline
Former-commit-id: dd30a5f940 [formerly bc9df0a8f9] [formerly f97d78994b] [formerly dd30a5f940 [formerly bc9df0a8f9] [formerly f97d78994b] [formerly c15b3ffe20 [formerly f97d78994b [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]]]
Former-commit-id: c15b3ffe20
Former-commit-id: 2fd4ac9397 [formerly 81a3f29afc] [formerly 6578eddad397d44d5b9e9908233734077c464b81 [formerly 5f492500ea]]
Former-commit-id: 419ae74464bf2fde736619a602f8bbae8a6b4c86 [formerly 0c94cc97fb]
Former-commit-id: 1c2dffd66d
2013-03-18 15:43:32 -05:00
Steve Harris
352658125b 13.3.1-7 baseline
Former-commit-id: 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly e12ed113ae [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]]]
Former-commit-id: e12ed113ae
Former-commit-id: 45a2d0501d [formerly ed5f1dbab6] [formerly d299d49a18ce894ac93ab2f7c3535d2ed60e4151 [formerly 31c0a97dca]]
Former-commit-id: 096ac88075679da8529975d1e43734a1aba18a81 [formerly 3084a860cd]
Former-commit-id: 88b28c39c1
2013-03-13 09:50:28 -05:00
Steve Harris
ed1788343e 13.3.1-6 baseline
Former-commit-id: 4eef6862d6 [formerly 2e110bd151] [formerly 3a4c7931e1] [formerly 4eef6862d6 [formerly 2e110bd151] [formerly 3a4c7931e1] [formerly 566b677d09 [formerly 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]]]
Former-commit-id: 566b677d09
Former-commit-id: 0cec06c171 [formerly 6fe4b16924] [formerly d7e03fcb3e7009a23e58cf48707fadfffebfe3d0 [formerly 4ed21b702b]]
Former-commit-id: 0e585016165e18d475399f775c1938136de541c6 [formerly c6f379f59a]
Former-commit-id: c28f3aeb02
2013-03-12 08:35:45 -05:00
Steve Harris
f20c87110e 13.3.1-5 baseline
Former-commit-id: e4a1c61ad5 [formerly 8123d5ac45] [formerly a89221c75b] [formerly e4a1c61ad5 [formerly 8123d5ac45] [formerly a89221c75b] [formerly e26f7eb151 [formerly a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]]]
Former-commit-id: e26f7eb151
Former-commit-id: aabd5cd51f [formerly a240379588] [formerly 96eeb29b073d8e7bf413ace53284a7d3f9fd8170 [formerly a40c9136fe]]
Former-commit-id: 8b4bd6790f2136380dbac557b452d873c77bacc6 [formerly 1f98e01c57]
Former-commit-id: 79ff805090
2013-03-05 10:47:06 -06:00
Steve Harris
52aae101cc 13.3.1-4 baseline
Former-commit-id: 9066d511fe [formerly d79303de13] [formerly 8c0b90f292] [formerly 9066d511fe [formerly d79303de13] [formerly 8c0b90f292] [formerly 2edca90902 [formerly 8c0b90f292 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]]]
Former-commit-id: 2edca90902
Former-commit-id: 4bfbb518c0 [formerly 3e0614b43a] [formerly c3fe7088594b70139dad19673128f3fd665d1be1 [formerly 5e55ded3a9]]
Former-commit-id: e4eaa93661df211ab065d6c9dd5f042f5011f151 [formerly 0df35cc5ec]
Former-commit-id: 153aadc1d7
2013-03-05 10:39:59 -06:00
Steve Harris
02f04a926e 13.3.1-3 baseline
Former-commit-id: 4a0eea00b5 [formerly a55f438dd8] [formerly 6572452887] [formerly 4a0eea00b5 [formerly a55f438dd8] [formerly 6572452887] [formerly 8a64f142e5 [formerly 6572452887 [formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]]]]
Former-commit-id: 8a64f142e5
Former-commit-id: 30efc4c86a [formerly 05eb25f124] [formerly ef9a242ccd88bfb5175203c6f71d0491e5e16b07 [formerly 8d741715e3]]
Former-commit-id: 1fe55774d4f2229cf3fdf3a4a342eab88f5b63cd [formerly 1ba778753f]
Former-commit-id: 9da8db0212
2013-02-25 10:24:53 -05:00
Steve Harris
dbaeb28c82 13.3.1-2 baseline
Former-commit-id: 0b3acc0130 [formerly 3e60b23072] [formerly df6d6f598e] [formerly 0b3acc0130 [formerly 3e60b23072] [formerly df6d6f598e] [formerly 3d115ed3be [formerly df6d6f598e [formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]]]
Former-commit-id: 3d115ed3be
Former-commit-id: f2428e968a [formerly 370ed98038] [formerly 3d35a57312645a04351b1cba8c83774e80dcc4da [formerly e8a51dc780]]
Former-commit-id: 6be2b60d013b857004e97817b3188f6eb4ae78f5 [formerly 2a2a9e03b7]
Former-commit-id: a43233f8c2
2013-02-25 10:18:36 -05:00
Steve Harris
067dfcb980 13.3.1-1 baseline
Former-commit-id: 9bdd52a626 [formerly 96768407a5] [formerly 0563d7ac18] [formerly 9bdd52a626 [formerly 96768407a5] [formerly 0563d7ac18] [formerly cabc8cf8b4 [formerly 0563d7ac18 [formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]]]]
Former-commit-id: cabc8cf8b4
Former-commit-id: 96c7269df0 [formerly 0569ff413d] [formerly c69f91c8e87239b610a4a8da6e4238eb3011b229 [formerly 92e4c7ba19]]
Former-commit-id: a43ccc92cdffebafcecdfdadcfc25825beb32b12 [formerly 654f15be5c]
Former-commit-id: 07e4e4c8fb
2013-02-21 09:36:59 -05:00
Steve Harris
77dbde9e45 13.2.1-8 baseline
Former-commit-id: 1af911d098 [formerly da707ff25c] [formerly 27d88edcb9] [formerly 1af911d098 [formerly da707ff25c] [formerly 27d88edcb9] [formerly 535a9402a7 [formerly 27d88edcb9 [formerly 1da0393f24829256c090d06ea8f7a0eca5e68bfd]]]]
Former-commit-id: 535a9402a7
Former-commit-id: 825a99770d [formerly 58bafc0068] [formerly 0a9388f77add45c1702ce16113b0c20068e2d223 [formerly a68ce64f45]]
Former-commit-id: 0d9c5ea952e6d4f898bb127acdeb6807009e309c [formerly 7b6e374314]
Former-commit-id: 933e9f3f75
2013-02-18 09:23:06 -05:00
Steve Harris
ee8bfc9941 13.2.1-7 baseline
Former-commit-id: c0b56ae597 [formerly 370b2558f0] [formerly 1ce95d1df2] [formerly c0b56ae597 [formerly 370b2558f0] [formerly 1ce95d1df2] [formerly c86246ab4d [formerly 1ce95d1df2 [formerly 132297ab4acf8e649e3cf9a3d54d4f4676b280be]]]]
Former-commit-id: c86246ab4d
Former-commit-id: f76444254f [formerly 4bc81ce1de] [formerly 487e22db3552e2e061b19f214b91446a1ad77f8e [formerly 37be2e3f23]]
Former-commit-id: 4e998b11e07806a3d1725189e94643feab1fbb68 [formerly 4c0a8e0106]
Former-commit-id: b2c3100109
2013-02-11 16:50:39 -05:00
Steve Harris
91ea402e4a 13.2.1-6 baseline
Former-commit-id: 9b7251d17e [formerly cc48fa4fc6] [formerly b80782b081] [formerly 9b7251d17e [formerly cc48fa4fc6] [formerly b80782b081] [formerly 53adfb7345 [formerly b80782b081 [formerly 2bdf04a09ff6a145eb73f5ad5c1e5140c8a3e0d0]]]]
Former-commit-id: 53adfb7345
Former-commit-id: 12e0cd07f2 [formerly 1f44caaedb] [formerly c2b93522588c69765c159821337fa509e477775e [formerly dee1480773]]
Former-commit-id: 18ada68ce3b5705ca7409e9672f65a4b86114240 [formerly 16b7b742be]
Former-commit-id: 46eee24352
2013-02-07 16:38:44 -05:00
Steve Harris
d935b8ee0b 13.2.1-5 baseline
Former-commit-id: 05c2ca86f4 [formerly 1a74d2f0c5] [formerly b4014794de] [formerly 05c2ca86f4 [formerly 1a74d2f0c5] [formerly b4014794de] [formerly f99f99e2f5 [formerly b4014794de [formerly 7a6958217f8b67edac937a23cb1c2ae8a89cedce]]]]
Former-commit-id: f99f99e2f5
Former-commit-id: c0a6bcf215 [formerly 39cb931bc9] [formerly 3422292903b976eeee7ff48443c918b662079695 [formerly 418d8ca0d8]]
Former-commit-id: f1e95f619dc7a9c68e2f3bd58d6bdb5b76adb105 [formerly 256b596d88]
Former-commit-id: fdf67e8292
2013-02-04 16:36:29 -05:00
Steve Harris
552c6528eb 13.2.1-4 baseline
Former-commit-id: 5acf001c1b [formerly f2b28cfa56] [formerly 1beb655fa0] [formerly 5acf001c1b [formerly f2b28cfa56] [formerly 1beb655fa0] [formerly 1e77a6f0bd [formerly 1beb655fa0 [formerly 7a04400ebdaabfd380fc9fc0f1dae119f49e59ee]]]]
Former-commit-id: 1e77a6f0bd
Former-commit-id: a3bd6e4aec [formerly 06f4b4ad5a] [formerly 8415524a4a291e13a736e0a26d38dc66c27a7bbd [formerly e6e4de6247]]
Former-commit-id: 2279711be5e623be8a80d9c3eec1bcd3be94f13e [formerly 0c67e2153f]
Former-commit-id: d52f193d7f
2013-01-31 12:05:59 -05:00
Steve Harris
264b5bb073 13.2.1-3 baseline
Former-commit-id: 7d2e979c51 [formerly a5a0da5c02] [formerly 7435527b25] [formerly 7d2e979c51 [formerly a5a0da5c02] [formerly 7435527b25] [formerly 2b6ac028bd [formerly 7435527b25 [formerly ba03739c3528638c5383528fd64674ae5af1ed64]]]]
Former-commit-id: 2b6ac028bd
Former-commit-id: d069467e81 [formerly 9d248cff7a] [formerly 32e4736725f3f6d880854f4dba7503e4939e28b7 [formerly cc0fdef15c]]
Former-commit-id: 1062fcca38400bed252816a16308c04554196b61 [formerly 082e66584a]
Former-commit-id: ab562e22a4
2013-01-23 11:24:17 -05:00
Steve Harris
b92dfd1b62 13.2.1-2 baseline
Former-commit-id: a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]]
Former-commit-id: 328c6dccad
Former-commit-id: ce726fadc7 [formerly d9be4dce21] [formerly f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79]]
Former-commit-id: 281ab815ed143a9ff49cedae7054da06195e3c69 [formerly 547c1dedd1]
Former-commit-id: 2779f5c6d9
2013-01-23 11:18:44 -05:00