Commit graph

7208 commits

Author SHA1 Message Date
Ying-Lian.Shi
9cc833a566 ASM #646 GFE: Event end time cannot be set beyond 96 hours on the MakeHazard GUI
Change-Id: I83e1701be2417e7ee6c0223e192cb9e0731c761b

Former-commit-id: d5036028d9 [formerly 89fca6f761] [formerly d5036028d9 [formerly 89fca6f761] [formerly 58958ef423 [formerly 6341d72f458c62756f27c851f0db654ab901b7af]]]
Former-commit-id: 58958ef423
Former-commit-id: bbc3892a5e [formerly f55dd98ae8]
Former-commit-id: d1c3156ebc
2014-11-21 14:32:17 +00:00
Nate Jensen
ac21133b2a Merge "Omaha #2707 fixed LSR update script" into omaha_14.4.1
Former-commit-id: a2f3f93724 [formerly 18b160faac] [formerly a2f3f93724 [formerly 18b160faac] [formerly e42bf53f7a [formerly 828a103cf403430684f84f18dbfe0c044655e307]]]
Former-commit-id: e42bf53f7a
Former-commit-id: 782698f6d5 [formerly 4b9b013b22]
Former-commit-id: dabd672b21
2014-10-28 18:03:13 -05:00
Brian Clements
75992e7b1e Omaha #2707 fixed LSR update script
Change-Id: I879d7d425f19113cae2c0bbc6f43df1edcf5594a

Former-commit-id: 3659812649 [formerly 3c0c33288a] [formerly 3659812649 [formerly 3c0c33288a] [formerly 0f5d97c961 [formerly ee38c97013e2a0c83e555cbbe77a9978296e39f1]]]
Former-commit-id: 0f5d97c961
Former-commit-id: bce723c005 [formerly 682ad5d400]
Former-commit-id: 621b966108
2014-10-28 17:57:38 -05:00
Benjamin Phillippe
d99bc9b189 Omaha #3454 Adding sequences to tables in events schema
Change-Id: I79d03c5f97eeecdb665fee624cdae377555fa373

Former-commit-id: 306508bdbd [formerly 80879d9efa] [formerly 306508bdbd [formerly 80879d9efa] [formerly a13c0a8b39 [formerly fa5ec2a1866784e8b0fc0f9a6c0d3a363cbcc22d]]]
Former-commit-id: a13c0a8b39
Former-commit-id: c1dba0e118 [formerly 73c1c816c0]
Former-commit-id: 33afe8bbe3
2014-10-28 15:56:47 -05:00
Richard Peter
ff81058698 Merge "Omaha #3454 Adding sequences to tables in events schema" into omaha_14.4.1
Former-commit-id: 3f1217ac04 [formerly 7c8a19d149] [formerly 3f1217ac04 [formerly 7c8a19d149] [formerly 14a86f1063 [formerly 3fb87f623c38b78c1d1046990fb05576851174d2]]]
Former-commit-id: 14a86f1063
Former-commit-id: 1f71ff6cc9 [formerly be63cfd242]
Former-commit-id: 08c3220397
2014-10-28 15:50:26 -05:00
Nate Jensen
9b737d0de0 Merge "Omaha #3720 Remove dataURI column references from redbook" into omaha_14.4.1
Former-commit-id: 325bf767a0 [formerly 13096c2eaa] [formerly 325bf767a0 [formerly 13096c2eaa] [formerly 9fe7950e24 [formerly add132c7f2baf5b421590827559b99954133be76]]]
Former-commit-id: 9fe7950e24
Former-commit-id: 473d2edd5d [formerly 751d88442c]
Former-commit-id: 6b094ebc5a
2014-10-28 15:32:55 -05:00
Nate Jensen
bbd168641c Merge "Omaha #3454 Fixing usage of getSession() to ensure proper session closure" into omaha_14.4.1
Former-commit-id: 2f2eb20e61 [formerly bf7d9b31b7] [formerly 2f2eb20e61 [formerly bf7d9b31b7] [formerly e54ebf94e5 [formerly 7306aeaa7986aa69d2c18c00d940fb2eb0624612]]]
Former-commit-id: e54ebf94e5
Former-commit-id: d0d6fb1e06 [formerly 870fd8efd9]
Former-commit-id: 256673b52c
2014-10-28 15:32:41 -05:00
Nate Jensen
62d09b5325 Merge "Omaha #3681 SatBlended implements Interrogatable" into omaha_14.4.1
Former-commit-id: c4c4fd4cf8 [formerly 040f9f0877] [formerly c4c4fd4cf8 [formerly 040f9f0877] [formerly c89de11b63 [formerly 17861a7e752838399a918c3b09dcaba8095a6a18]]]
Former-commit-id: c89de11b63
Former-commit-id: 1d4b172f30 [formerly 5d3e3e58dd]
Former-commit-id: 302373258b
2014-10-28 15:32:32 -05:00
Ron Anderson
2f3ef2ec36 Merge "Omaha #3685 Fix spell checker to use mixed case. Fix bug in importShapefile" into omaha_14.4.1
Former-commit-id: ca7c91e795 [formerly ee12f5dc65] [formerly ca7c91e795 [formerly ee12f5dc65] [formerly 30d031989e [formerly e076201872a69829228a6e78d632287839acf3d8]]]
Former-commit-id: 30d031989e
Former-commit-id: 93301efdcb [formerly d20a38f031]
Former-commit-id: d5537d06a1
2014-10-28 15:15:26 -05:00
Ron Anderson
fe9904a7c6 Merge "Omaha #3685 Add support for sending specific products in mixed case" into omaha_14.4.1
Former-commit-id: 89acc631a3 [formerly 8b32ac8f54] [formerly 89acc631a3 [formerly 8b32ac8f54] [formerly 9bd76e678f [formerly 453e478604f048ae019eeee9bb8e46883b58254e]]]
Former-commit-id: 9bd76e678f
Former-commit-id: 7dc3b17ac9 [formerly f448c493a8]
Former-commit-id: bc941a71dc
2014-10-28 15:15:16 -05:00
Steve Harris
74c0a4bc61 Merge tag 'OB_14.3.1-28m' into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/AdhocSubscription.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/MonitorAreaUtils.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/db/RetrievalDao.java
	rpms/awips2.core/Installer.gfe.climo/component.spec

Former-commit-id: 40225d128a [formerly 1b83d045ea] [formerly 40225d128a [formerly 1b83d045ea] [formerly 19527f50bb [formerly 353674cd0deec2dd86c38dc75c7593d1477a7e78]]]
Former-commit-id: 19527f50bb
Former-commit-id: 8db5f15d53 [formerly bd4b324ebe]
Former-commit-id: f3e7b20ac7
2014-10-28 13:32:31 -05:00
Mark Peters
3996d6e092 Omaha #3720 Remove dataURI column references from redbook
Change-Id: I81ba779e6e9ded93256c7ccd7b2932ceefbfd51d

Former-commit-id: 8c9ecdd400 [formerly d03a4bd3e7] [formerly 8c9ecdd400 [formerly d03a4bd3e7] [formerly c034d98ab9 [formerly 48160d952981b597634c941741e2bc370a5fdb5f]]]
Former-commit-id: c034d98ab9
Former-commit-id: c4ea40b3f1 [formerly 76a2964c73]
Former-commit-id: f41bd31e83
2014-10-28 12:21:45 -05:00
Benjamin Phillippe
31108feda5 Omaha #3454 Fixing usage of getSession() to ensure proper session closure
Former-commit-id: 8cd0c6542c [formerly bbd2081844] [formerly 8cd0c6542c [formerly bbd2081844] [formerly 50f5c8d1e3 [formerly fc36b84fa43c354b674f040ae5d2647df5b3122f]]]
Former-commit-id: 50f5c8d1e3
Former-commit-id: 8bbb7b35b4 [formerly a9e2e96d76]
Former-commit-id: 8632c490c0
2014-10-28 11:30:25 -05:00
Benjamin Phillippe
67f9009560 Omaha #3454 Adding sequences to tables in events schema
Former-commit-id: 703155654b [formerly 39f00d60ae] [formerly 703155654b [formerly 39f00d60ae] [formerly 4af35d83f8 [formerly 9799cba1a2c525190d297f7e355cda29f1e98ee7]]]
Former-commit-id: 4af35d83f8
Former-commit-id: 09b9729a30 [formerly acea99bb5e]
Former-commit-id: f0d145874b
2014-10-28 10:30:47 -05:00
Ben Steffensmeier
53e138540e Omaha #3681 SatBlended implements Interrogatable
Former-commit-id: 9d375a5617 [formerly 790dee3349] [formerly 9d375a5617 [formerly 790dee3349] [formerly 5e63b30ab0 [formerly 10b1129bb8c938d99b9c74816927f3879a1ef6a2]]]
Former-commit-id: 5e63b30ab0
Former-commit-id: cba6b0d5b0 [formerly 2bca486744]
Former-commit-id: 43f33db057
2014-10-27 18:16:49 -05:00
Nate Jensen
2600b1d3b5 Merge "Omaha #3612 Fixed Thin client plugin blacklist" into omaha_14.4.1
Former-commit-id: 9973cc8340 [formerly 714c42a24d] [formerly 9973cc8340 [formerly 714c42a24d] [formerly ced3e75600 [formerly 370411bb2ca890457e0630804c3a6b0b46080c3a]]]
Former-commit-id: ced3e75600
Former-commit-id: 39334f2fa0 [formerly 2626b9ff33]
Former-commit-id: 33ba8a4a6c
2014-10-27 13:34:22 -05:00
Max Schenkelberg
807772ef45 Omaha #3612 Fixed Thin client plugin blacklist
Change-Id: I989656df46a6ebd9dd64c41f44f9335591848d42

Former-commit-id: c17fd3d774 [formerly 629d56f480] [formerly c17fd3d774 [formerly 629d56f480] [formerly 1fa0ff4c67 [formerly b3f42acd1a8fc814b7fa1e094f1f39f8a374567d]]]
Former-commit-id: 1fa0ff4c67
Former-commit-id: e8ce4acfaf [formerly b7fcd1a455]
Former-commit-id: 17fcea56d0
2014-10-27 13:07:50 -05:00
Benjamin Phillippe
18c31c5857 Omaha #3454 Configuring Hibernate query plan cache settings
Former-commit-id: db28926645 [formerly 8095f8e21a] [formerly db28926645 [formerly 8095f8e21a] [formerly 52e3ba5914 [formerly 0d18e110bf2266400b538d38c4f42078d78a5b41]]]
Former-commit-id: 52e3ba5914
Former-commit-id: ce9ce1f4f4 [formerly 676d77920d]
Former-commit-id: 781d6fe06e
2014-10-24 10:44:38 -05:00
David Lovely
396eb2cda5 Omaha #2991 Initial add of qpid 0.28. Fixed an issue with the x86_64 directory not being created.
Change-Id: Iacd5c7d8b41ab3100b7ea9c409ec18691ffe7fdc

Former-commit-id: 3d1fa8e1b8 [formerly 2f9c1e8303] [formerly 3d1fa8e1b8 [formerly 2f9c1e8303] [formerly 081ea4a12a [formerly b50c56c84968f4765245ec12fa33c3037b0380ff]]]
Former-commit-id: 081ea4a12a
Former-commit-id: 28639c96c0 [formerly 2f02a475a8]
Former-commit-id: ab038bc4c7
2014-10-23 15:55:26 -05:00
Benjamin Phillippe
7b8b7c12dd Omaha #3454 Fixing text purge
Former-commit-id: 9bc5473d29 [formerly 2f7c98d960] [formerly 9bc5473d29 [formerly 2f7c98d960] [formerly 5606597b56 [formerly 43299673f2172188bc44866c6ccd5552fda348cb]]]
Former-commit-id: 5606597b56
Former-commit-id: 7a9277d53d [formerly e2759d38e4]
Former-commit-id: 3fe4feaea6
2014-10-23 12:54:26 -05:00
Greg Armendariz
1f2f2c302f Merge "Omaha #3299 attempt to fix cave p2-install order" into omaha_14.4.1
Former-commit-id: d4c7882e4f [formerly 8d25cfcc94] [formerly d4c7882e4f [formerly 8d25cfcc94] [formerly abfcd2505f [formerly 2604e7f68719bf1e5b4ba1d2e212f26341926938]]]
Former-commit-id: abfcd2505f
Former-commit-id: 0ebf2f4b29 [formerly 8c46b21075]
Former-commit-id: af235215d9
2014-10-23 11:45:00 -05:00
Nate Jensen
873f38db4d Omaha #3299 attempt to fix cave p2-install order
Change-Id: Ic02c4a1c28d6be67cff709e0ea50fed3e36ca6b3

Former-commit-id: 7f0bc3f860 [formerly 972245b270] [formerly 7f0bc3f860 [formerly 972245b270] [formerly ca94deb789 [formerly d8ef7657cada2a7ec2bf1c3b2c70011a3d160913]]]
Former-commit-id: ca94deb789
Former-commit-id: 6877642c65 [formerly d17c972d04]
Former-commit-id: 19d56eca8e
2014-10-23 11:35:44 -05:00
Nate Jensen
d56f2baea8 Merge "Omaha #3668 Switch grid requests to job pool." into omaha_14.4.1
Former-commit-id: 7bff603b2c [formerly b9ffe1b4ce] [formerly 7bff603b2c [formerly b9ffe1b4ce] [formerly d50a3bab27 [formerly 6360d4efca94ed47661c239a7a84088661027d64]]]
Former-commit-id: d50a3bab27
Former-commit-id: d693703c63 [formerly 04ba3e6583]
Former-commit-id: 9435df398f
2014-10-23 11:15:58 -05:00
Ben Steffensmeier
9f8fedddc3 Omaha #3668 Switch grid requests to job pool.
Former-commit-id: a61eaa6695 [formerly f940b4d3d4] [formerly a61eaa6695 [formerly f940b4d3d4] [formerly d5d432e7bd [formerly 6552b496329f6ef9404a4872048a61e020ab9565]]]
Former-commit-id: d5d432e7bd
Former-commit-id: 8eb62f63c7 [formerly ee38a062d0]
Former-commit-id: b044d1cf80
2014-10-23 10:30:27 -05:00
Ron Anderson
83ff68647a Omaha #3685 Fix spell checker to use mixed case.
Fix bug in importShapefile

Change-Id: I818bef97b2306cb47e07d4885e77906d1fd5c793

Former-commit-id: ea43af0c3a [formerly 6ab8c36e83] [formerly ea43af0c3a [formerly 6ab8c36e83] [formerly 5c1570eafd [formerly 25ded2580ec97f4a966297f0af6dbb5d0e66956a]]]
Former-commit-id: 5c1570eafd
Former-commit-id: 2cee0f2bb9 [formerly c8042a4ee2]
Former-commit-id: 31553de133
2014-10-23 09:02:16 -05:00
Nate Jensen
994c8ae829 Omaha #3713 fix build
Change-Id: I84adced908a1f09e802cb5c05fa86ce65f0c3af6

Former-commit-id: 028b8b4609 [formerly 129e6031e6] [formerly 028b8b4609 [formerly 129e6031e6] [formerly 318badc290 [formerly ec59ed4c41cb867e80340ef9ff44b5e575f0da55]]]
Former-commit-id: 318badc290
Former-commit-id: 664e764874 [formerly 8b93f74b65]
Former-commit-id: 150fc23bfe
2014-10-22 17:00:27 -05:00
Nate Jensen
b1a258d7f9 Merge "Omaha #3713 The aviation advisory menu items should be contributed by the com.raytheon.uf.viz.aviation.advisory plugin" into omaha_14.4.1
Former-commit-id: fb1a02c800 [formerly 7cd4d5aa0d] [formerly fb1a02c800 [formerly 7cd4d5aa0d] [formerly b8ed807e4e [formerly 6a7420db347a08d5200f0549e80d684c1e3ad83f]]]
Former-commit-id: b8ed807e4e
Former-commit-id: 37660eee4a [formerly 3e0c5af32b]
Former-commit-id: 608160de55
2014-10-22 15:21:48 -05:00
Ron Anderson
94c875ced4 Omaha #3685 Add support for sending specific products in mixed case
Change-Id: I3c7e8bfe285ce7344ddfccf28173a68f3396b126

Former-commit-id: 64162dd9c0 [formerly e729cd8814] [formerly 64162dd9c0 [formerly e729cd8814] [formerly 5d07d13aa0 [formerly 18d4fc13ebbd77b3a476bc70252fae1322d631c6]]]
Former-commit-id: 5d07d13aa0
Former-commit-id: ba737603f1 [formerly 5e711922d7]
Former-commit-id: 3f248e341a
2014-10-22 14:29:30 -05:00
Brian.Dyke
ddb3a6fc97 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 564db5cd87 [formerly 9199e8b072] [formerly 564db5cd87 [formerly 9199e8b072] [formerly 268f76df74 [formerly 97623c832e9ba336959d6f4f11045ec9738657eb]]]
Former-commit-id: 268f76df74
Former-commit-id: ef08117a63 [formerly b1608227ef]
Former-commit-id: e7fef28b20
2014-10-22 14:51:41 -04:00
Shawn.Hooper
ed790d1a7a ASM #16805 - Removed references to obsolete license.txt file and renamed Master_Rights_file.pdf
Change-Id: I2b3a021440c834df3505ed11a2883f0fb214a868

Former-commit-id: 114ff128ed [formerly 0e372cd13e] [formerly 114ff128ed [formerly 0e372cd13e] [formerly 3b4b9d262a [formerly e29cf5a57591e5a25b6e73b267c0abb46e9f95c2]]]
Former-commit-id: 3b4b9d262a
Former-commit-id: b1426303fa [formerly d62f27cae6]
Former-commit-id: cc74b6bb2c
2014-10-22 14:47:42 -04:00
Steve Harris
116b83101e Merge tag 'OB_14.3.1-27m' into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml

Former-commit-id: e9c9a17f96 [formerly dc557b2d0c] [formerly e9c9a17f96 [formerly dc557b2d0c] [formerly bfade7674d [formerly ea787b645974850607658e5a7dfc4a072d831a3b]]]
Former-commit-id: bfade7674d
Former-commit-id: 879b0608ed [formerly 9e7ce04543]
Former-commit-id: 040e641ec9
2014-10-22 11:45:39 -05:00
Richard Peter
04023ecfe3 Merge "Omaha #3744 Adjust cave g1 region size." into omaha_14.4.1
Former-commit-id: 5c10fe0251 [formerly d679022b3f] [formerly 5c10fe0251 [formerly d679022b3f] [formerly 4dc4428f62 [formerly 53bcf86ca4db5ad10fdd2adc3f22a18567a66507]]]
Former-commit-id: 4dc4428f62
Former-commit-id: fba5ab2d39 [formerly 6c35f40508]
Former-commit-id: 73d4cc14ef
2014-10-22 11:18:12 -05:00
Ben Steffensmeier
f7bff32ffe Omaha #3744 Adjust cave g1 region size.
Former-commit-id: 1a1fafb08a [formerly 2c9d16911a] [formerly 1a1fafb08a [formerly 2c9d16911a] [formerly 19ccfa6633 [formerly a60888ed9e08f3bb56f39ef287bb6d02a49d3241]]]
Former-commit-id: 19ccfa6633
Former-commit-id: 3117cdd13c [formerly d5c85324d8]
Former-commit-id: 46e3e3b7d9
2014-10-22 10:30:33 -05:00
Brian.Dyke
9b06c9038c Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 975f877994 [formerly 9bcc6bb52e] [formerly 975f877994 [formerly 9bcc6bb52e] [formerly abb4203634 [formerly c8cd8594507148284ac3ec2283fcc9e152c532a6]]]
Former-commit-id: abb4203634
Former-commit-id: a16d6c944f [formerly 40717fa44c]
Former-commit-id: 06f41040c2
2014-10-22 10:39:36 -04:00
Mark Peters
f928a2760c Omaha #3713 The aviation advisory menu items should be contributed by the com.raytheon.uf.viz.aviation.advisory plugin
Change-Id: I7c32e066175dab712e69398b58b5e56f4dbde3f4

Former-commit-id: 220491ed18 [formerly 402591056c] [formerly 220491ed18 [formerly 402591056c] [formerly ef80e7632f [formerly 19d480da4e9b4ec9eab86b0438757eb451867409]]]
Former-commit-id: ef80e7632f
Former-commit-id: 54d23f5716 [formerly 3956b4ecf8]
Former-commit-id: 81da40a29e
2014-10-21 17:03:53 -05:00
David Lovely
05b6e83a4c Omaha #3721 Changed Grid Data reference to a Soft Reference and reduced memory usage from X*Y to X*3.
Change-Id: I627ded464d411e7f975df088261a975657d41d9a

Former-commit-id: 8a5c1607c9 [formerly 636e823956] [formerly 8a5c1607c9 [formerly 636e823956] [formerly 531b62d114 [formerly 9a6313162a5477863d30ab0a888608ee419067a9]]]
Former-commit-id: 531b62d114
Former-commit-id: d6ba9bdbb7 [formerly 44120d9fba]
Former-commit-id: 2b2a5fcd43
2014-10-21 16:06:18 -05:00
Richard Peter
3a80d5c801 Merge "Omaha #3454 Upgrading to Hibernate 4.2.15" into omaha_14.4.1
Former-commit-id: d2f0ab621f [formerly 05784292b7] [formerly d2f0ab621f [formerly 05784292b7] [formerly 2c21e72bf3 [formerly 6b2879d8180a6b6f60a340977e3254ee5eb95213]]]
Former-commit-id: 2c21e72bf3
Former-commit-id: 168854e078 [formerly 7b9653cdad]
Former-commit-id: b77d5b33aa
2014-10-21 10:51:56 -05:00
Shawn.Hooper
2b594e3be8 Merge "ASM #13467 - Update GenericHazards.py for Shannon" into asm_14.3.1
Former-commit-id: d998d23eb4 [formerly 4e0cb152d2] [formerly d998d23eb4 [formerly 4e0cb152d2] [formerly 92204e05a1 [formerly 4bbcf01f8a3abf038f3183c5872bc8f9f12624a1]]]
Former-commit-id: 92204e05a1
Former-commit-id: 86d953da5c [formerly f1841b5042]
Former-commit-id: a531fdfa56
2014-10-21 10:35:01 -05:00
Shawn.Hooper
490cb64a41 ASM #16805 - Fix rpms/legal/ directory
Change-Id: I369e4d5423c760bf689180239f15cfd363a202b3

Former-commit-id: 26054621ca [formerly d0fba5965b] [formerly 26054621ca [formerly d0fba5965b] [formerly a96693cb70 [formerly 94872b496bec6c427030ea353856466809d2e6c1]]]
Former-commit-id: a96693cb70
Former-commit-id: 78cd702d20 [formerly f98e05c9de]
Former-commit-id: b99895779f
2014-10-21 11:17:45 -04:00
Shawn.Hooper
67d5d621ed ASM #13467 - Update GenericHazards.py for Shannon
Change-Id: Ic1131929aa14f97cff0e1cf92e30c338470f368e

Former-commit-id: 700bc0691c [formerly 4d81023184] [formerly 700bc0691c [formerly 4d81023184] [formerly ddeec493c3 [formerly f4e8f7493bbfb025e8040f7663dc582414a87413]]]
Former-commit-id: ddeec493c3
Former-commit-id: 115a9c1fd9 [formerly f1feaee0ea]
Former-commit-id: 2d96f0e149
2014-10-21 11:11:34 -04:00
Nate Jensen
c81c996c4b Merge "Omaha #3598 Update grid scripts to use DAF. Accept level information in request identifiers." into omaha_14.4.1
Former-commit-id: 1798a75f18 [formerly 24aca9cd99] [formerly 1798a75f18 [formerly 24aca9cd99] [formerly 73c03a3379 [formerly 450faac664f274c1c2ce1bbc0100ecaa984309f7]]]
Former-commit-id: 73c03a3379
Former-commit-id: 1854ad5653 [formerly 1e3b551f4b]
Former-commit-id: cf8e567c18
2014-10-21 08:55:37 -05:00
Nathan Bowler
2565e3f305 Omaha #3598 Update grid scripts to use DAF. Accept level information in request identifiers.
Change-Id: I18011b95dc7dc2a0d92d41ce6e7864d3aaa1afbf

Former-commit-id: 679c836fdc [formerly d9f75f5adc] [formerly 679c836fdc [formerly d9f75f5adc] [formerly 1ff018ccdf [formerly 8b001934bef0d672bce4739accf994eba497b32c]]]
Former-commit-id: 1ff018ccdf
Former-commit-id: 674b6c2dcc [formerly 23950384ee]
Former-commit-id: 5268e32927
2014-10-21 07:16:18 -04:00
Nate Jensen
f6bd3b959c Merge "Omaha #3418 Fixed NPE for cell trends. Fixed possible NPE in PointsDataManager catch block." into omaha_14.4.1
Former-commit-id: 332fb931c6 [formerly 26c8400ac1] [formerly 332fb931c6 [formerly 26c8400ac1] [formerly 579f38dc62 [formerly abd0db67d4525476a55be5c07ca8c50228c54258]]]
Former-commit-id: 579f38dc62
Former-commit-id: 2bfb26f4e6 [formerly 561e40d3d3]
Former-commit-id: 74a3fa0607
2014-10-20 15:32:17 -05:00
David Lovely
8487137803 Omaha #3418 Fixed NPE for cell trends. Fixed possible NPE in PointsDataManager catch block.
Change-Id: Ice45220f2798e4004d41fa8fe78ccad8b5737f0d

Former-commit-id: f83eb3e69b [formerly d7cd4cc845] [formerly f83eb3e69b [formerly d7cd4cc845] [formerly 2e7cade8d6 [formerly 68d3cede303b82dd3fde23255d830289f967a889]]]
Former-commit-id: 2e7cade8d6
Former-commit-id: 1eac8ddbe8 [formerly 9e1b263569]
Former-commit-id: a9b97bbd58
2014-10-20 14:42:39 -05:00
Slav Korolev
8a6f3b4749 Omaha #3220 - Corrected area configuration managers for Fog, SAFESEAS and SNOW monitors.
Former-commit-id: 1f4ed7fd1b [formerly 9c369a9c5c] [formerly 1f4ed7fd1b [formerly 9c369a9c5c] [formerly 8971f40dc2 [formerly 5fb653e5c7f7ffff1daf53487147597a569d7d11]]]
Former-commit-id: 8971f40dc2
Former-commit-id: 19db4c34bb [formerly e517a73d81]
Former-commit-id: de09cba07a
2014-10-20 15:06:05 -04:00
Matthew Howard
f2364ce437 Merge "ASM #16858 - Check in SerpISC tool." into asm_14.3.1
Former-commit-id: cf3afaf2bb [formerly 8827f5e49c] [formerly cf3afaf2bb [formerly 8827f5e49c] [formerly 587cf1b66e [formerly 4a965632119a9349cf320125b97db52498a760c8]]]
Former-commit-id: 587cf1b66e
Former-commit-id: 31e1eaf1cf [formerly 612cf99edb]
Former-commit-id: 30c0cf769c
2014-10-20 13:56:06 -05:00
Rici.Yu
aca44fc590 ASM #16858 - Check in SerpISC tool.
Change-Id: I4c15360c377370bd757ed2eaad7aeade49412fd6

Former-commit-id: 51adc6a204 [formerly 9c2555466c] [formerly 51adc6a204 [formerly 9c2555466c] [formerly 6958f11ea7 [formerly 1e8961e4f4a8168b667ce4b689efd88157dfb61c]]]
Former-commit-id: 6958f11ea7
Former-commit-id: f069fa1fea [formerly 5c22571568]
Former-commit-id: c502ac8d82
2014-10-20 14:39:46 -04:00
Shawn.Hooper
82afe46187 ASM #16805 - Update master rights and license files for 14.3.1.
Change-Id: Ifb5b67010a01dfa9805e64d408f5688d10d7bf82

Former-commit-id: 217f39ee04 [formerly e24cb3c37e] [formerly 217f39ee04 [formerly e24cb3c37e] [formerly 65065f2380 [formerly f72ec046e98bdb6734dbce10ef472dd5294c59ba]]]
Former-commit-id: 65065f2380
Former-commit-id: c491bf611e [formerly e50becc648]
Former-commit-id: 17f88aad75
2014-10-20 14:36:31 -04:00
Benjamin Phillippe
008b23be1e Omaha #3454 Upgrading to Hibernate 4.2.15
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29

Former-commit-id: e6deeb6fb5 [formerly 7845e8e40f] [formerly e6deeb6fb5 [formerly 7845e8e40f] [formerly fdd16051e8 [formerly 293e59403b6d6e1d792d9fc6d8a0ac106a490bf5]]]
Former-commit-id: fdd16051e8
Former-commit-id: a8ef477042 [formerly 5eec33b078]
Former-commit-id: 3808c125b9
2014-10-20 12:42:19 -05:00
Slav Korolev
be8e3fb6b2 Issue #2757 - Fixed a problem with duplicate zones.
Former-commit-id: bde08f6c38 [formerly 0d4ed62be4] [formerly bde08f6c38 [formerly 0d4ed62be4] [formerly 079b74d69c [formerly 8929c542c33090555dd9db16113453e1000c6e5b]]]
Former-commit-id: 079b74d69c
Former-commit-id: 7df98880af [formerly 7555a3be9d]
Former-commit-id: a3f162adfe
2014-10-20 13:08:44 -04:00