mjames-upc
|
5b6bc2ace8
|
RequiredExecutionEnvironment: JavaSE-1.7
|
2016-02-03 21:45:47 -06:00 |
|
mjames-upc
|
cf98143c02
|
few new colormaps for LI, PW, WV
|
2016-01-08 09:53:08 -07:00 |
|
mjames-upc
|
a333d34383
|
cleanup sat product names and nwsauth/collab/useradmin plugins
|
2015-12-30 15:24:14 -07:00 |
|
mjames-upc
|
0b01029e68
|
cleaning up unidata_15.1.1 enough to launch in eclipse
|
2015-12-29 20:15:31 -07:00 |
|
AWIPS User
|
dc8f7f341b
|
major D2D menu updates for 14.4.2
Former-commit-id: eb898b9ccd
|
2015-10-23 18:56:09 -06:00 |
|
AWIPS User
|
cb4abfe96c
|
remove edex.decodertools from common.satellite because p2 builds RPMs with circular dependencies and FUBARs on install
Former-commit-id: 82f188d650 [formerly 10d6b1649f] [formerly 6e1c8328cba83f4359842c05d2c366614ac5f6aa [formerly 0e38b0a31b]]
Former-commit-id: 0090599e3a946192c519e02518edfb7da10523fb [formerly eaf14651ef]
Former-commit-id: 7c494d525b
|
2015-07-14 09:17:58 -06:00 |
|
AWIPS User
|
797ef67b12
|
com.raytheon.uf.common.dataplugin.satellite can not reference actual plugin version because something goes FUBAR in the p2 build and errors are thrown on rpm install
Former-commit-id: d3a24d7acc [formerly de1f29df3f] [formerly 6202eac91350c7585501c705bd85bc14f0d3bb44 [formerly 60b4d454f8]]
Former-commit-id: 94009414c710625591d2746fce5b160e8a085018 [formerly 4de7fa3f5b]
Former-commit-id: a6530eb451
|
2015-07-13 15:57:50 -06:00 |
|
AWIPS User
|
db0d05f9f9
|
NPP menus, sat imagery rules, precip/MSLP bundle added
Former-commit-id: 046c6003a5 [formerly 1ba31c289f] [formerly 94e415a0e594041a14edae8b60b5a86df9c89240 [formerly a5196fe357]]
Former-commit-id: 29fd9f06bcabd069aaa5483a19c97fbe6fdec938 [formerly 79b3407065]
Former-commit-id: 0633275b22
|
2015-07-03 09:16:24 -06:00 |
|
mjames-upc
|
5fbb381419
|
FNEXRAD menu config changes, labeling rule and colormap updates.
Former-commit-id: ac7ae413d6 [formerly ca188dd577] [formerly 6b86850d998657483ef8cce38bfa4163e72fa6c7 [formerly a5e9391e16]]
Former-commit-id: 51a6be2ce13b111b12a8ec1d4c6007df11276969 [formerly 749eef0c44]
Former-commit-id: d4eacc8497
|
2015-06-25 14:41:12 -06:00 |
|
AWIPS User
|
933f773bd3
|
FNEXRAD colormap updates and sat plugin style rule additions for labeling and scaling.
Former-commit-id: f2686ee818 [formerly 12671eeb72] [formerly 8649b7addd8eb1a89c378e6c9f62d6d27140ae0b [formerly 4fe8043de6]]
Former-commit-id: d4fda9d5ab85f0cba5a47539b0329c106488d457 [formerly 941abfbb43]
Former-commit-id: 698a833291
|
2015-06-24 20:31:12 -06:00 |
|
AWIPS User
|
c2375590d3
|
copy constructCRSfromWKT from McidasCRSBuilder because eclipse PDE build fails to import gov.noaa.nws.ncep.edex.common
Former-commit-id: bd223f5edc [formerly 270312e06b] [formerly bc759b5222b6bb473e2c1f86a49e45a732d88269 [formerly c0cc9e88c6]]
Former-commit-id: a12c497703f7cb8ad53b34b62eb64a02eccfdae0 [formerly dcd3c56bf3]
Former-commit-id: c5185e7a52
|
2015-06-23 16:18:27 -06:00 |
|
AWIPS User
|
40c10581c9
|
Clear data menu command change to wipe loaded products. Also Tileset buffer added for Mcidas native projections.
Former-commit-id: f769ec9f80 [formerly da8a5a42ea] [formerly e499cf5c10fe894a26b1e7e52658a798ed6c0098 [formerly cf580ae837]]
Former-commit-id: a448bc94828ed21ed99e9c8c62d7f04c6fe05e84 [formerly 892d9150d3]
Former-commit-id: 172307d5ce
|
2015-06-16 10:14:39 -06:00 |
|
AWIPS User
|
69f88a23ca
|
Raytheon satellite decoder now handles McIDAS native projection reconstruction from postgresql.
Former-commit-id: 484a6b3dd9 [formerly 2c5c524582] [formerly 16d775e4ba92c997e628a71f1efebcab508eb717 [formerly cbb6c6f45b]]
Former-commit-id: 043231d9ed998454f75583fec1236b5b38acef1d [formerly d39bc148e7]
Former-commit-id: 9be29e6bec
|
2015-06-16 10:14:30 -06:00 |
|
AWIPS User
|
b03b498770
|
GVAR McIDAS native projection support added for Raytheon satellite.mcidas decoder.
Former-commit-id: 6a08478261 [formerly 17f3681bd0] [formerly eb151d7a68cb7ba6e2717b0050401f4d9b00618d [formerly bf979e7040]]
Former-commit-id: c2bfd8ad63b90fb7cd356f9e1d100a2bb30e6698 [formerly b9f2552744]
Former-commit-id: 659fac2925
|
2015-06-16 10:14:16 -06:00 |
|
AWIPS User
|
ab315fa55e
|
South polar stereographic CRS support added to satellite.mcidas decoder. Arctic/Antarctic UNIWISC supported. Area name/entity/paramewter table additions for UNIWISC
Former-commit-id: 1517852c46 [formerly 6ae2284610] [formerly 37560f8172352c763a7308969faf710144c9d276 [formerly ceb0c7a739]]
Former-commit-id: 4ac86c6b37c5c84fdb1e069b943b152dff3cecde [formerly 2ee11df21d]
Former-commit-id: dd333fdebc
|
2015-06-16 10:12:47 -06:00 |
|
Ben Steffensmeier
|
788efb162e
|
Omaha #4388 Support signed/unsigned conversion of fill value.
Former-commit-id: 75959a30f26ea8f323d232d3b118e93539904ad1
|
2015-04-20 11:08:03 -05:00 |
|
Ben Steffensmeier
|
e06fccfdfd
|
Omaha #4388 Use the record fill value in satellite resource.
Former-commit-id: d13b4cfda688ecec9dfa0563787ff6370c980443
|
2015-04-15 14:44:49 -05:00 |
|
Mark Peters
|
82ddd6a608
|
Omaha #4179 Abstract out getAvailableValues()
Change-Id: I6cceaf0e91db04eda2be76e687015d02cd91f0db
Former-commit-id: 1a0b9f20a89fcaca55e9af51c6f0996a99b65af5
|
2015-02-27 14:24:46 -06:00 |
|
Mark Peters
|
e383afe23f
|
Omaha #4124 Implement getAvailableParameters() for satellite retrieval through DAF
Change-Id: I532640b7305ad0f5e7423a35e37abce22866ebad
Former-commit-id: 51466d91a9327b0bcfdeae9d1eadcd06df622da1
|
2015-02-17 17:06:45 -06:00 |
|
Steve Harris
|
158fa16376
|
Merge branch 'master_14.4.1' (OB_14.4.1-2m) into omaha_14.4.1
Conflicts:
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec
Former-commit-id: 75c2b6304f398eeb8d508ee67d0c6a7c7bf26f79
|
2015-01-23 09:08:06 -06:00 |
|
Steve Harris
|
936834331d
|
Merge branch 'master_14.4.1' (OB_14.4.1-2m) into omaha_14.4.1
Conflicts:
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec
Former-commit-id: ea3465f55a [formerly 8cd9e2e92f] [formerly 158fa16376] [formerly ea3465f55a [formerly 8cd9e2e92f] [formerly 158fa16376] [formerly 0f05c53a53 [formerly 158fa16376 [formerly 75c2b6304f398eeb8d508ee67d0c6a7c7bf26f79]]]]
Former-commit-id: 0f05c53a53
Former-commit-id: c6bb3f9f17 [formerly 5fda208a17] [formerly fd646e3ab88985355fb86128bc69473ecf242072 [formerly 033d0fc742]]
Former-commit-id: 10bac022834ddaeda42626dd3c8c191014cda5e8 [formerly c3d3d5f424]
Former-commit-id: fcdd2faaf1
|
2015-01-23 09:08:06 -06:00 |
|
Nate Jensen
|
05307be9d0
|
Omaha #3993 ensure important dataplugin utility folders are included in
viz builds
Change-Id: I3bb2a464f482995943e3729e439c3f0c8fbfe747
Former-commit-id: 9f30c7195d6a62206bae05d6e17df4a8e068255e
|
2015-01-13 16:47:04 -06:00 |
|
Nate Jensen
|
aa93629c1a
|
Omaha #3993 ensure important dataplugin utility folders are included in
viz builds
Change-Id: I3bb2a464f482995943e3729e439c3f0c8fbfe747
Former-commit-id: 88e656a34d [formerly f88f62191f] [formerly 05307be9d0] [formerly 88e656a34d [formerly f88f62191f] [formerly 05307be9d0] [formerly b434ae1343 [formerly 05307be9d0 [formerly 9f30c7195d6a62206bae05d6e17df4a8e068255e]]]]
Former-commit-id: b434ae1343
Former-commit-id: 482a44faa4 [formerly 9df5c9249b] [formerly cc869028254962519b3a37875e8c730e5b42e009 [formerly 39ab8668fa]]
Former-commit-id: f298e0439354a644ee18ab4fd923ae39f704342c [formerly 69d8073d94]
Former-commit-id: 7a14b2de0c
|
2015-01-13 16:47:04 -06:00 |
|
Fay.Liang
|
c6bd5d7675
|
ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
rpms/awips2.core/Installer.postgres/component.spec
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.tools/component.spec
rpms/python.site-packages/Installer.h5py/component.spec
rpms/python.site-packages/Installer.matplotlib/component.spec
rpms/python.site-packages/Installer.nose/component.spec
rpms/python.site-packages/Installer.pupynere/component.spec
rpms/python.site-packages/Installer.qpid/component.spec
rpms/python.site-packages/Installer.scientific/component.spec
rpms/python.site-packages/Installer.scipy/component.spec
rpms/python.site-packages/Installer.shapely/component.spec
rpms/python.site-packages/Installer.tables/component.spec
Former-commit-id: 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd
|
2015-01-12 13:03:31 -05:00 |
|
Fay.Liang
|
bccf70f0bd
|
ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
rpms/awips2.core/Installer.postgres/component.spec
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.tools/component.spec
rpms/python.site-packages/Installer.h5py/component.spec
rpms/python.site-packages/Installer.matplotlib/component.spec
rpms/python.site-packages/Installer.nose/component.spec
rpms/python.site-packages/Installer.pupynere/component.spec
rpms/python.site-packages/Installer.qpid/component.spec
rpms/python.site-packages/Installer.scientific/component.spec
rpms/python.site-packages/Installer.scipy/component.spec
rpms/python.site-packages/Installer.shapely/component.spec
rpms/python.site-packages/Installer.tables/component.spec
Former-commit-id: 19a29da5de [formerly 6b77894bd0] [formerly c6bd5d7675] [formerly 19a29da5de [formerly 6b77894bd0] [formerly c6bd5d7675] [formerly eed6737801 [formerly c6bd5d7675 [formerly 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd]]]]
Former-commit-id: eed6737801
Former-commit-id: 23ba9f4154 [formerly f3ecae8573] [formerly 69382d354f0cba941ad1b60d73cca2d121eb949e [formerly 5cc8e5b4af]]
Former-commit-id: cd3c370873d18a2ca3801fd2f83aa4f8b35fe06e [formerly 06ac6b396e]
Former-commit-id: 1e9024ede9
|
2015-01-12 13:03:31 -05:00 |
|
Kiran.Shrestha
|
8216ea6b6b
|
ASM #622 Total Precipitable Water (TPW) satellite field should be displayed in inches
Change-Id: Ia7aba807682f559f11522491f7d64280eef9eac0
Former-commit-id: 039ccf8cf811b9e4f868138da8074df3ea4a862a
|
2014-12-17 21:20:57 +00:00 |
|
Kiran.Shrestha
|
e154a8aecc
|
ASM #622 Total Precipitable Water (TPW) satellite field should be displayed in inches
Change-Id: Ia7aba807682f559f11522491f7d64280eef9eac0
Former-commit-id: 79845d8507 [formerly 897ca1de81] [formerly bbddbac8cddc69a80d995311e954c51927d41533 [formerly 8216ea6b6b]] [formerly 79845d8507 [formerly 897ca1de81] [formerly bbddbac8cddc69a80d995311e954c51927d41533 [formerly 8216ea6b6b]] [formerly 991f4c22c8 [formerly 8216ea6b6b [formerly 039ccf8cf811b9e4f868138da8074df3ea4a862a]]]]
Former-commit-id: 991f4c22c8
Former-commit-id: 2cc1089ca4 [formerly 2f498d1e9b] [formerly 40365b112ab97a8589f424b1ae648402b17f7abd [formerly dff62cf9d3]]
Former-commit-id: dcb8a2007273b75c78524f3e6bb28f8cdd94ba8b [formerly 73f4fe509d]
Former-commit-id: d39deb8ea3
|
2014-12-17 21:20:57 +00:00 |
|
Ben Steffensmeier
|
5d40da982a
|
Omaha #3788 Switch satellite_spatial.gid to a sequence.
Former-commit-id: 919f4ca671ca953b881037e4a69d720d3bf79eb5
|
2014-11-07 10:23:39 -06:00 |
|
Ben Steffensmeier
|
51687ddbcf
|
Omaha #3788 Switch satellite_spatial.gid to a sequence.
Former-commit-id: 53ac3b1880 [formerly f6a74c59f7] [formerly 5d40da982a] [formerly 53ac3b1880 [formerly f6a74c59f7] [formerly 5d40da982a] [formerly 7988d740b0 [formerly 5d40da982a [formerly 919f4ca671ca953b881037e4a69d720d3bf79eb5]]]]
Former-commit-id: 7988d740b0
Former-commit-id: ffa5ae90f8 [formerly bae0a4f665] [formerly 005d114a673a0b6474f5c39650b3f6baa89f4d0d [formerly 07b91982bb]]
Former-commit-id: 7bb0a5b134062a3b703851b0436626bed5d4e861 [formerly 6a155a41dc]
Former-commit-id: a25cb9d62c
|
2014-11-07 10:23:39 -06:00 |
|
Benjamin Phillippe
|
7845e8e40f
|
Omaha #3454 Upgrading to Hibernate 4.2.15
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29
Former-commit-id: 293e59403b6d6e1d792d9fc6d8a0ac106a490bf5
|
2014-10-20 12:42:19 -05:00 |
|
Benjamin Phillippe
|
b4acac2eaa
|
Omaha #3454 Upgrading to Hibernate 4.2.15
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29
Former-commit-id: af4f8e1c8a [formerly e6deeb6fb5] [formerly 7845e8e40f] [formerly af4f8e1c8a [formerly e6deeb6fb5] [formerly 7845e8e40f] [formerly fdd16051e8 [formerly 7845e8e40f [formerly 293e59403b6d6e1d792d9fc6d8a0ac106a490bf5]]]]
Former-commit-id: fdd16051e8
Former-commit-id: c77edf49f8 [formerly a8ef477042] [formerly d7e89f87bfd941634f6cb4c75072b070108267c4 [formerly 5eec33b078]]
Former-commit-id: 62bf8f62e268a6361913c3567879ca0d71e2b3ef [formerly 3808c125b9]
Former-commit-id: 008b23be1e
|
2014-10-20 12:42:19 -05:00 |
|
Nathan Bowler
|
368b6341b0
|
Omaha #3596 Update scripts to use DAF. Always put creatingEntity in returned attributes.
Change-Id: I456ff499ccf9446622d1535323afc0d0d1f9b70d
Former-commit-id: d67d1e941b89357e7d86fa0f810a82f9e01f4c27
|
2014-10-01 14:57:16 -04:00 |
|
Nathan Bowler
|
8e9c981ab5
|
Omaha #3596 Update scripts to use DAF. Always put creatingEntity in returned attributes.
Change-Id: I456ff499ccf9446622d1535323afc0d0d1f9b70d
Former-commit-id: 1e4b1e36b2 [formerly 2d5d90c055] [formerly 368b6341b0] [formerly 1e4b1e36b2 [formerly 2d5d90c055] [formerly 368b6341b0] [formerly e4779f2e66 [formerly 368b6341b0 [formerly d67d1e941b89357e7d86fa0f810a82f9e01f4c27]]]]
Former-commit-id: e4779f2e66
Former-commit-id: 79af766519 [formerly b52c1bcafd] [formerly b4a68483c3c014922902f65e575fb102c53dbab2 [formerly a72fec1b38]]
Former-commit-id: 6b8908ca678fa42ab5f5a2ce8f4008e2b1c32ca6 [formerly ae5bde3c3d]
Former-commit-id: 8f18ed535e
|
2014-10-01 14:57:16 -04:00 |
|
Nate Jensen
|
b3083a663e
|
Omaha #3356 cleanup of unnecessary register buddies and buddy policies
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0
Former-commit-id: 48536dd79d933508ac54b3b6e9bbd166fd218330
|
2014-08-14 10:22:37 -05:00 |
|
Nate Jensen
|
f7ae70ac02
|
Omaha #3356 cleanup of unnecessary register buddies and buddy policies
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0
Former-commit-id: d61c65787b [formerly 253198b5bc] [formerly b3083a663e] [formerly d61c65787b [formerly 253198b5bc] [formerly b3083a663e] [formerly 9b72a1399d [formerly b3083a663e [formerly 48536dd79d933508ac54b3b6e9bbd166fd218330]]]]
Former-commit-id: 9b72a1399d
Former-commit-id: e7b11aaf88 [formerly 58a4cb95c1] [formerly 1fed4e6852cd8eca79ebee598c5badd5a0a3fe14 [formerly d67083655a]]
Former-commit-id: 7e191ad12969bca5c4c6b83a1e9488c58f4c6928 [formerly 951feab33d]
Former-commit-id: 7336692b85
|
2014-08-14 10:22:37 -05:00 |
|
Brian Clements
|
90d492c1dc
|
Omaha #3503 common.serialization changes
moved adapters to new plugins
Change-Id: I34c66b004ce1c5aa61c093fe2eeb2fe8d3b138b6
Former-commit-id: adba61c3714678ce57f0de5bfd4f9aa860098bd9
|
2014-08-08 12:50:06 -05:00 |
|
Brian Clements
|
51f49bd36d
|
Omaha #3503 common.serialization changes
moved adapters to new plugins
Change-Id: I34c66b004ce1c5aa61c093fe2eeb2fe8d3b138b6
Former-commit-id: 81144aa9e2 [formerly 9c09de5779] [formerly 90d492c1dc] [formerly 81144aa9e2 [formerly 9c09de5779] [formerly 90d492c1dc] [formerly 415f2dff64 [formerly 90d492c1dc [formerly adba61c3714678ce57f0de5bfd4f9aa860098bd9]]]]
Former-commit-id: 415f2dff64
Former-commit-id: e61bbeab33 [formerly d6aae6eaeb] [formerly 4bbada7b433206885b217a05943790769bea6e90 [formerly 0e415fd863]]
Former-commit-id: abe85f086aa74f360d31be08a09ecfa5ffe31308 [formerly 54742cff70]
Former-commit-id: b83ec9df6c
|
2014-08-08 12:50:06 -05:00 |
|
Nate Jensen
|
3c1ae47a76
|
Omaha #3184 renamed valid identifiers to optional
Change-Id: I9653f9e00b3c693b46b516bc52ff029cd4fe1a81
Former-commit-id: d0e68c2fa1cc531263622410e4364b87f222139f
|
2014-07-31 09:45:01 -05:00 |
|
Nate Jensen
|
e56370bdbf
|
Omaha #3184 renamed valid identifiers to optional
Change-Id: I9653f9e00b3c693b46b516bc52ff029cd4fe1a81
Former-commit-id: 3a9c29fa88 [formerly 77d0661861] [formerly 3c1ae47a76] [formerly 3a9c29fa88 [formerly 77d0661861] [formerly 3c1ae47a76] [formerly 857179e08d [formerly 3c1ae47a76 [formerly d0e68c2fa1cc531263622410e4364b87f222139f]]]]
Former-commit-id: 857179e08d
Former-commit-id: b2826881d1 [formerly 79ae128758] [formerly 5f5ccd371d4bb68eebbd37f681f382e2a4178a4a [formerly f3ce06c00e]]
Former-commit-id: f9519e138b50bf79c072fbfcdbbbe1e83b82f510 [formerly 90e35b4745]
Former-commit-id: f4dc5f03b6
|
2014-07-31 09:45:01 -05:00 |
|
Steve Harris
|
6d58f3944e
|
Omaha #3090 - Added files missed from merging omaha_14.3.1 into omaha_14.4.1 (b6055725)
Former-commit-id: 81aab5e7001eca87d4d8889ae96367eee433ee88
|
2014-06-11 16:00:09 -05:00 |
|
Steve Harris
|
7721c824ce
|
Omaha #3090 - Added files missed from merging omaha_14.3.1 into omaha_14.4.1 (b6055725)
Former-commit-id: 2ebf11a1ad [formerly 975bfdf386] [formerly 6d58f3944e] [formerly 2ebf11a1ad [formerly 975bfdf386] [formerly 6d58f3944e] [formerly fbc6c6c31b [formerly 6d58f3944e [formerly 81aab5e7001eca87d4d8889ae96367eee433ee88]]]]
Former-commit-id: fbc6c6c31b
Former-commit-id: ddf0128484 [formerly 1abf5019f1] [formerly 936b80481f070cf450636512b5f21ef49e152eb4 [formerly e53dfdfdca]]
Former-commit-id: 9acc80e3bc040b90876d4ffc60fa68f9cc36af74 [formerly 22841c139e]
Former-commit-id: b4de28ee62
|
2014-06-11 16:00:09 -05:00 |
|
Ben Steffensmeier
|
d838ecc734
|
Omaha #2061 Remove IDecoderGettable from all AWIPS2 Raytheon PDOs.
Former-commit-id: b6c63e5791a2438253d6ff039b5164c61105a941
|
2014-06-11 12:38:35 -05:00 |
|
Ben Steffensmeier
|
f4319b5920
|
Omaha #2061 Remove IDecoderGettable from all AWIPS2 Raytheon PDOs.
Former-commit-id: 257cfe8bd3 [formerly a96199cc47] [formerly d838ecc734] [formerly 257cfe8bd3 [formerly a96199cc47] [formerly d838ecc734] [formerly 30415ae8c5 [formerly d838ecc734 [formerly b6c63e5791a2438253d6ff039b5164c61105a941]]]]
Former-commit-id: 30415ae8c5
Former-commit-id: 1210c094d7 [formerly 08a1e07918] [formerly c6abdf4a8300c5eb3d9c3950d871d79698655d9a [formerly eb7cf7e8da]]
Former-commit-id: e02af9791372650c46525cb594c1dd112707a9c1 [formerly 02c4332c6a]
Former-commit-id: 3db0af5561
|
2014-06-11 12:38:35 -05:00 |
|
Steve Harris
|
5a3c6a11c2
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts (these moved to ufcore):
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbMapQueryFactory.java
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbMapResource.java
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbPointMapResource.java
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DefaultDbMapQuery.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/VizApp.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
cave/com.raytheon.uf.viz.ui.menus/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLShadedShapeBase.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ListSelectionDlg.java
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.dataplugin.maps/src/com/raytheon/uf/common/dataplugin/maps/dataaccess/util/MapsQueryUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/poesDif11u3_7uIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u12uIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u13uIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u3_9uIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDivWVIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDif11u3_9uIR.py
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDifference.py
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDivWVIR.py
edexOsgi/com.raytheon.uf.common.dataplugin/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginDataObject.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginProperties.java
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Cape.py
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Dcape.py
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Filter.py
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Slice.py
edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/tree/DerivedLevelNode.java
edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/tree/OrLevelNode.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/ReferencedGeometry.java
edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/TimeAndSpace.java
edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/TimeAndSpaceMatcher.java
edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/data/AbstractRequestableData.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.common.localization/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/region/RegionLookup.java
edexOsgi/com.raytheon.uf.common.message/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.message/src/com/raytheon/uf/common/message/WsId.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/JUtilHandler.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/JAXBManager.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/SizeUtil.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/SystemUtil.java
edexOsgi/com.raytheon.uf.edex.auth/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.auth/build.properties
edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-common.xml
edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteRequestRouteWrapper.java
edexOsgi/com.raytheon.uf.edex.core/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/EDEXUtil.java
edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/dataplugin/PluginRegistry.java
edexOsgi/com.raytheon.uf.edex.database/res/spring/database-common.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/DatabaseClassAnnotationFinder.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/DatabasePluginRegistry.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/cluster/handler/SharedLockHandler.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginFactory.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/processor/IDatabaseProcessor.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/query/DatabaseQuery.java
edexOsgi/com.raytheon.uf.edex.distribution/res/spring/distribution-spring.xml
edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/src/com/raytheon/uf/edex/esb/Main.java
edexOsgi/com.raytheon.uf.edex.esb.camel/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/StringToFile.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/jms/DedicatedThreadJmsComponent.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/spring/JmsThreadPoolTaskExecutor.java
edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-ingest.xml
edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-request.xml
edexOsgi/com.raytheon.uf.edex.ingest/src/com/raytheon/uf/edex/ingest/notification/PluginNotifier.java
edexOsgi/com.raytheon.uf.edex.purgesrv/res/spring/purge-spring.xml
edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-ingest.xml
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java
Former-commit-id: 505635792772e5f261f47fd980f33d371c8dbfcc
|
2014-04-30 11:22:22 -05:00 |
|
Steve Harris
|
64492a05dc
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts (these moved to ufcore):
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbMapQueryFactory.java
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbMapResource.java
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbPointMapResource.java
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DefaultDbMapQuery.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/VizApp.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
cave/com.raytheon.uf.viz.ui.menus/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLShadedShapeBase.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ListSelectionDlg.java
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.dataplugin.maps/src/com/raytheon/uf/common/dataplugin/maps/dataaccess/util/MapsQueryUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/poesDif11u3_7uIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u12uIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u13uIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u3_9uIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDivWVIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDif11u3_9uIR.py
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDifference.py
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDivWVIR.py
edexOsgi/com.raytheon.uf.common.dataplugin/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginDataObject.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginProperties.java
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Cape.py
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Dcape.py
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Filter.py
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Slice.py
edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/tree/DerivedLevelNode.java
edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/tree/OrLevelNode.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/ReferencedGeometry.java
edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/TimeAndSpace.java
edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/TimeAndSpaceMatcher.java
edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/data/AbstractRequestableData.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.common.localization/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/region/RegionLookup.java
edexOsgi/com.raytheon.uf.common.message/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.message/src/com/raytheon/uf/common/message/WsId.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/JUtilHandler.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/JAXBManager.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/SizeUtil.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/SystemUtil.java
edexOsgi/com.raytheon.uf.edex.auth/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.auth/build.properties
edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-common.xml
edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteRequestRouteWrapper.java
edexOsgi/com.raytheon.uf.edex.core/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/EDEXUtil.java
edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/dataplugin/PluginRegistry.java
edexOsgi/com.raytheon.uf.edex.database/res/spring/database-common.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/DatabaseClassAnnotationFinder.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/DatabasePluginRegistry.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/cluster/handler/SharedLockHandler.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginFactory.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/processor/IDatabaseProcessor.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/query/DatabaseQuery.java
edexOsgi/com.raytheon.uf.edex.distribution/res/spring/distribution-spring.xml
edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/src/com/raytheon/uf/edex/esb/Main.java
edexOsgi/com.raytheon.uf.edex.esb.camel/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/StringToFile.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/jms/DedicatedThreadJmsComponent.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/spring/JmsThreadPoolTaskExecutor.java
edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-ingest.xml
edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-request.xml
edexOsgi/com.raytheon.uf.edex.ingest/src/com/raytheon/uf/edex/ingest/notification/PluginNotifier.java
edexOsgi/com.raytheon.uf.edex.purgesrv/res/spring/purge-spring.xml
edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-ingest.xml
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java
Former-commit-id: 6a80bc2971 [formerly 7f3a19cd1f] [formerly 5a3c6a11c2] [formerly 6a80bc2971 [formerly 7f3a19cd1f] [formerly 5a3c6a11c2] [formerly 3380a1dba0 [formerly 5a3c6a11c2 [formerly 505635792772e5f261f47fd980f33d371c8dbfcc]]]]
Former-commit-id: 3380a1dba0
Former-commit-id: 103318357b [formerly 6ad5b5a9d7] [formerly ba5d0a9ff7373ccedcbbb73791d2d7a098c2ff8e [formerly f168d3dddb]]
Former-commit-id: 8ccde1991c055590b9341bfb6729666eea087e32 [formerly 98b93e364e]
Former-commit-id: d214c3174d
|
2014-04-30 11:22:22 -05:00 |
|
Ben Steffensmeier
|
709e3411c4
|
Issue #2947 Redo satellite derived parameters to use an inventory to determine availability.
Former-commit-id: 1a041cb3be1141f4af116335e5b9540beda817cb
|
2014-04-16 14:54:59 -05:00 |
|
Ben Steffensmeier
|
f1d28d027f
|
Issue #2947 Redo satellite derived parameters to use an inventory to determine availability.
Former-commit-id: 2d8106bc5b [formerly bb51fb299a] [formerly 709e3411c4] [formerly 2d8106bc5b [formerly bb51fb299a] [formerly 709e3411c4] [formerly a8bb2c0dfd [formerly 709e3411c4 [formerly 1a041cb3be1141f4af116335e5b9540beda817cb]]]]
Former-commit-id: a8bb2c0dfd
Former-commit-id: 858deeaef5 [formerly a51b965c4f] [formerly 4a7f1c2296d79b72f15c1dafa088a798fe5a813e [formerly 119ced4a01]]
Former-commit-id: fc1291a1e39fed83821a2edd5ba3bf44aa962f2a [formerly cc6d858f47]
Former-commit-id: 3c1adead47
|
2014-04-16 14:54:59 -05:00 |
|
Ben Steffensmeier
|
dd794a3c12
|
Issue #2947 Minor satellite and derived parameter improvements.
Former-commit-id: d5fe527ff45e02cbbba3a92f2031d500db879839
|
2014-04-11 17:37:59 -05:00 |
|
Ben Steffensmeier
|
98337b3f0d
|
Issue #2947 Minor satellite and derived parameter improvements.
Former-commit-id: 4004fe2d18 [formerly 2d66e58671] [formerly dd794a3c12] [formerly 4004fe2d18 [formerly 2d66e58671] [formerly dd794a3c12] [formerly 428f3a2d8b [formerly dd794a3c12 [formerly d5fe527ff45e02cbbba3a92f2031d500db879839]]]]
Former-commit-id: 428f3a2d8b
Former-commit-id: a224105467 [formerly b120feab6f] [formerly 8166890980b160e863adea23a121042b57a2fc64 [formerly 6c92b645f0]]
Former-commit-id: f27be8b57c10909a8e3cbfb66e8c92e1130fd5e7 [formerly 0b6ca56417]
Former-commit-id: 25c850b9d8
|
2014-04-11 17:37:59 -05:00 |
|
Steve Harris
|
d0aeb854f5
|
Merge branch 'omaha_14.2.1' (14.2.1-13) into development
Former-commit-id: a2318f04eea89a258400dea526daa4fe67b69271
|
2014-03-17 15:55:41 -05:00 |
|