diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/lib/database_rewinder/multiple_statements_executor.rb b/lib/database_rewinder/multiple_statements_executor.rb
index <HASH>..<HASH> 100644
--- a/lib/database_rewinder/multiple_statements_executor.rb
+++ b/lib/database_rewinder/multiple_statements_executor.rb
@@ -37,7 +37,7 @@ module DatabaseRewinder
when 'ActiveRecord::ConnectionAdapters::SQLite3Adapter'
log(sql) { @connection.execute_batch sql }
else
- execute sql
+ raise 'Multiple deletion is not supported with the current database adapter.'
end
end
end
|
`else` here should not be reachable
|
diff --git a/lib/db/access.php b/lib/db/access.php
index <HASH>..<HASH> 100644
--- a/lib/db/access.php
+++ b/lib/db/access.php
@@ -1553,8 +1553,6 @@ $capabilities = array(
)
),
'moodle/rating:rate' => array(
-
- 'riskbitmask' => RISK_DATALOSS,
'captype' => 'write',
'contextlevel' => CONTEXT_SYSTEM,
'legacy' => array(
|
rating MDL-<I> modified moodle/rating:rate risks
|
diff --git a/workshift/urls.py b/workshift/urls.py
index <HASH>..<HASH> 100644
--- a/workshift/urls.py
+++ b/workshift/urls.py
@@ -3,5 +3,12 @@ from django.conf.urls import url
from workshift import views
urlpatterns = [
- url(r"^workshift/$", views.workshift_view, name="workshift_view"),
+ url(r"^workshift/$", views.main_view, name="main"),
+ url(r"^workshift/preferences/(P<semester>\w+)/$", views.preferences_view, name="preferences"),
+ url(r"^workshift/manage/$", views.manage_view, name="manage"),
+ url(r"^workshift/manage/start_semester/$", views.start_semester_view, name="start_semester"),
+ url(r"^workshift/manage/assign_shifts/$", views.assign_shifts_view, name="assign_shifts"),
+ url(r"^workshift/manage/add_shift/$", views.add_shift_view, name="add_shift"),
+ url(r"^workshift/shifts/(P<shift_title>\w+)/$", views.shift_view, name="view_shift"),
+ url(r"^workshift/shifts/(P<shift_title>\w+)/edit$", views.edit_shift_view, name="edit_shift"),
]
|
Added more urls to urlpatterns
|
diff --git a/src/lib/adt/index.js b/src/lib/adt/index.js
index <HASH>..<HASH> 100644
--- a/src/lib/adt/index.js
+++ b/src/lib/adt/index.js
@@ -128,7 +128,8 @@ const MCNK = Chunk({
sizeMCSH: r.uint32le,
areaID: r.uint32le,
wmoCount: r.uint32le,
- holes: r.uint32le,
+ holes: r.uint16le,
+ unknown: r.uint16le,
textureMaps: new r.Reserved(r.uint16le, 8),
|
ADT chunk holes are <I>-bit
|
diff --git a/backend/impl/src/test/java/org/geomajas/internal/security/SecurityManagerLoopTest.java b/backend/impl/src/test/java/org/geomajas/internal/security/SecurityManagerLoopTest.java
index <HASH>..<HASH> 100644
--- a/backend/impl/src/test/java/org/geomajas/internal/security/SecurityManagerLoopTest.java
+++ b/backend/impl/src/test/java/org/geomajas/internal/security/SecurityManagerLoopTest.java
@@ -45,21 +45,18 @@ public class SecurityManagerLoopTest {
}
@Test
- @DirtiesContext
public void testLooping() {
Assert.assertTrue(securityManager.createSecurityContext("TEST"));
Assert.assertEquals(2, securityContext.getSecurityServiceResults().size());
}
@Test
- @DirtiesContext
public void testNotAuthenticated() {
Assert.assertFalse(securityManager.createSecurityContext("false"));
Assert.assertEquals(0, securityContext.getSecurityServiceResults().size());
}
@Test
- @DirtiesContext
public void testSecondOnly() {
Assert.assertTrue(securityManager.createSecurityContext("SECOND"));
Assert.assertEquals(1, securityContext.getSecurityServiceResults().size());
|
@DirtiesContext should not be needed, need to figure out cause if needed (-->jira)
|
diff --git a/src/providers/sh/commands/deploy.js b/src/providers/sh/commands/deploy.js
index <HASH>..<HASH> 100644
--- a/src/providers/sh/commands/deploy.js
+++ b/src/providers/sh/commands/deploy.js
@@ -97,10 +97,6 @@ const help = () => {
login Login into your account or creates a new one
logout Logout from your account
- ${chalk.dim('Providers')}
-
- sh, aws, gcp [cmd] Deploy using a different provider
-
${chalk.dim('Options:')}
-h, --help Output usage information
|
Temporarily hide providers from usage information (#<I>)
|
diff --git a/js/tests/roundtrip-test.js b/js/tests/roundtrip-test.js
index <HASH>..<HASH> 100755
--- a/js/tests/roundtrip-test.js
+++ b/js/tests/roundtrip-test.js
@@ -422,6 +422,7 @@ var fetch = function ( page, cb, options ) {
if ( options.apiURL ) {
parsoidConfig.setInterwiki( 'customwiki', options.apiURL );
}
+ parsoidConfig.editMode = Util.booleanOption( options.editMode );
MWParserEnvironment.getParserEnv( parsoidConfig, null, prefix, page, envCb );
};
@@ -471,6 +472,11 @@ if ( !module.parent ) {
'boolean': true,
'default': false
},
+ 'editMode': {
+ description: 'Test in edit-mode (changes some parse & serialization strategies)',
+ 'default': false, // suppress noise by default
+ 'boolean': true
+ },
'debug': {
description: 'Debug mode',
'boolean': true,
|
Add --editMode option to roundtrip-test.js.
Usually you don't want the noise, but turning on --editMode can help unearth
crashers in html2wt.
Change-Id: I<I>c0fc0dc4e<I>f<I>c8b<I>b<I>df<I>da4a3dc
|
diff --git a/spec/lib/mobi/metadata_spec.rb b/spec/lib/mobi/metadata_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/lib/mobi/metadata_spec.rb
+++ b/spec/lib/mobi/metadata_spec.rb
@@ -1,5 +1,8 @@
require 'spec_helper'
+require 'mobi/metadata'
+require 'mobi/stream_slicer'
+
describe Mobi::Metadata do
context 'initialization' do
diff --git a/spec/lib/mobi/stream_slicer_spec.rb b/spec/lib/mobi/stream_slicer_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/lib/mobi/stream_slicer_spec.rb
+++ b/spec/lib/mobi/stream_slicer_spec.rb
@@ -1,5 +1,7 @@
require 'spec_helper'
+require 'mobi/stream_slicer'
+
describe Mobi::StreamSlicer do
let(:file){ File.open('spec/fixtures/test.mobi') }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index <HASH>..<HASH> 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,9 +1,4 @@
-require 'rubygems'
-require 'bundler/setup'
-
-require 'mobi'
-require 'rr'
-
RSpec.configure do |config|
config.mock_with :rr
-end
\ No newline at end of file
+end
+
|
Manually require files in the specs.
|
diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java
index <HASH>..<HASH> 100644
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/GQuery.java
@@ -184,13 +184,6 @@ public class GQuery implements Lazy<GQuery, LazyGQuery> {
/**
* Wrap a GQuery around an existing element.
*/
- public static GQuery $(Function f) {
- return new GQuery(f.getElement());
- }
-
- /**
- * Wrap a GQuery around an existing element.
- */
public static GQuery $(Element element) {
return new GQuery(element);
}
|
This change should not be committed in r<I>
|
diff --git a/aeron-system-tests/src/test/java/io/aeron/PublishFromArbitraryPositionTest.java b/aeron-system-tests/src/test/java/io/aeron/PublishFromArbitraryPositionTest.java
index <HASH>..<HASH> 100644
--- a/aeron-system-tests/src/test/java/io/aeron/PublishFromArbitraryPositionTest.java
+++ b/aeron-system-tests/src/test/java/io/aeron/PublishFromArbitraryPositionTest.java
@@ -76,6 +76,7 @@ public class PublishFromArbitraryPositionTest
final int expectedNumberOfFragments = 10 + rnd.nextInt(10000);
final MediaDriver.Context driverCtx = new MediaDriver.Context()
+ .dirDeleteOnStart(true)
.errorHandler(Throwable::printStackTrace)
.termBufferSparseFile(true);
|
[Java] Delete archive dir on start of system test.
|
diff --git a/src/Page/PageBuilder.php b/src/Page/PageBuilder.php
index <HASH>..<HASH> 100644
--- a/src/Page/PageBuilder.php
+++ b/src/Page/PageBuilder.php
@@ -21,6 +21,7 @@ final class PageBuilder
private $datasource;
private $debug = false;
private $defaultDisplay = 'table';
+ private $disabledSorts = [];
private $dispatcher;
private $displayFilters = true;
private $displayPager = true;
@@ -367,6 +368,20 @@ final class PageBuilder
}
/**
+ * Disable a sort.
+ *
+ * Sorts are enabled by default but you can disable some.
+ *
+ * @return $this
+ */
+ public function disableSort($sort)
+ {
+ $this->disabledSorts[] = $sort;
+
+ return $this;
+ }
+
+ /**
* Get item per page
*
* @param int $limit
@@ -501,7 +516,14 @@ final class PageBuilder
$sort->prepare($route, $query);
if ($sortFields = $datasource->getSortFields($datasourceQuery)) {
+ foreach ($sortFields as $field => $label) {
+ if (in_array($field, $this->disabledSorts)) {
+ unset($sortFields[$field]);
+ }
+ }
+
$sort->setFields($sortFields);
+
// Do not set the sort order links if there is no field to sort on
if ($sortDefault = $datasource->getDefaultSort()) {
// @todo PHP 5.6 $sort->setDefault(...$sortDefault);
|
Allow to disable some sorts through the page builder
|
diff --git a/src/cobra/flux_analysis/parsimonious.py b/src/cobra/flux_analysis/parsimonious.py
index <HASH>..<HASH> 100644
--- a/src/cobra/flux_analysis/parsimonious.py
+++ b/src/cobra/flux_analysis/parsimonious.py
@@ -1,7 +1,7 @@
"""Provide parsimonious FBA implementation."""
from itertools import chain
-from typing import TYPE_CHECKING, Callable, Dict, List, Union
+from typing import TYPE_CHECKING, Callable, Dict, List, Optional, Union
from warnings import warn
from optlang.symbolics import Zero
@@ -45,7 +45,7 @@ def pfba(
model: "Model",
fraction_of_optimum: float = 1.0,
objective: Union[Dict, "Objective", None] = None,
- reactions: List["Reaction"] = None,
+ reactions: Optional[List["Reaction"]] = None,
) -> "Solution":
"""Perform basic pFBA (parsimonious Enzyme Usage Flux Balance Analysis).
@@ -70,7 +70,7 @@ def pfba(
reactions : list of cobra.Reaction, optional
List of cobra.Reaction. Implies `return_frame` to be true. Only
return fluxes for the given reactions. Faster than fetching all
- fluxes if only a few are needed.
+ fluxes if only a few are needed (default None).
Returns
-------
|
fix: use proper typing annotation in parsimonious.py
|
diff --git a/cloudfoundry-client-lib/src/main/java/org/cloudfoundry/client/lib/rest/CloudControllerClientV2.java b/cloudfoundry-client-lib/src/main/java/org/cloudfoundry/client/lib/rest/CloudControllerClientV2.java
index <HASH>..<HASH> 100644
--- a/cloudfoundry-client-lib/src/main/java/org/cloudfoundry/client/lib/rest/CloudControllerClientV2.java
+++ b/cloudfoundry-client-lib/src/main/java/org/cloudfoundry/client/lib/rest/CloudControllerClientV2.java
@@ -1127,9 +1127,8 @@ public class CloudControllerClientV2 extends AbstractCloudControllerClient {
private List<String> findApplicationUris(UUID appGuid) {
Map<String, Object> urlVars = new HashMap<String, Object>();
- String urlPath = "/v2/apps/{app}/routes?inline-relations-depth={depth}";
+ String urlPath = "/v2/apps/{app}/routes?inline-relations-depth=1";
urlVars.put("app", appGuid);
- urlVars.put("depth", 2);
List<Map<String, Object>> resourceList = getAllResources(urlPath, urlVars);
List<String> uris = new ArrayList<String>();
for (Map<String, Object> resource : resourceList) {
|
Reduce inline-relations-depth to 1 for apps/{app}/routes [#<I>]
|
diff --git a/src/router/registry.go b/src/router/registry.go
index <HASH>..<HASH> 100644
--- a/src/router/registry.go
+++ b/src/router/registry.go
@@ -301,6 +301,7 @@ func (r *Registry) Unregister(m *registryMessage) {
func (r *Registry) pruneStaleDroplets() {
if r.isStateStale() {
+ r.resetTracker()
return
}
@@ -318,6 +319,12 @@ func (r *Registry) pruneStaleDroplets() {
}
}
+func (r *Registry) resetTracker() {
+ for r.staleTracker.Len() > 0 {
+ r.staleTracker.Delete(r.staleTracker.Front().(*Backend))
+ }
+}
+
func (r *Registry) PruneStaleDroplets() {
r.Lock()
defer r.Unlock()
|
reset stale tracker state when it becomes stale
[#<I>]
|
diff --git a/TokenCollection.php b/TokenCollection.php
index <HASH>..<HASH> 100644
--- a/TokenCollection.php
+++ b/TokenCollection.php
@@ -20,7 +20,7 @@ class TokenCollection extends ArrayList {
*
* @return Token
*/
- public function get(int $index): Token {
+ public function get(int $index): ?Token {
return parent::get($index);
}
}
|
Fix TokenCollection
Adjust `TokenCollection::get()` method to return null, for consistency
with `ArrayList::get`.
|
diff --git a/clientv3/concurrency/mutex.go b/clientv3/concurrency/mutex.go
index <HASH>..<HASH> 100644
--- a/clientv3/concurrency/mutex.go
+++ b/clientv3/concurrency/mutex.go
@@ -82,12 +82,11 @@ func (m *Mutex) Lock(ctx context.Context) error {
client := m.s.Client()
// wait for deletion revisions prior to myKey
// TODO: early termination if the session key is deleted before other session keys with smaller revisions.
- hdr, werr := waitDeletes(ctx, client, m.pfx, m.myRev-1)
+ _, werr := waitDeletes(ctx, client, m.pfx, m.myRev-1)
// release lock key if wait failed
if werr != nil {
m.Unlock(client.Ctx())
- } else {
- m.hdr = hdr
+ return werr
}
// make sure the session is not expired, and the owner key still exists.
|
clientv3/concurrency: do not swallow error (#<I>)
|
diff --git a/lib/nodes.js b/lib/nodes.js
index <HASH>..<HASH> 100644
--- a/lib/nodes.js
+++ b/lib/nodes.js
@@ -392,6 +392,11 @@ ClassList.prototype.get = function (name) {
this.collections[name] : [];
};
+ClassList.prototype.count = function (name) {
+ return Object.prototype.hasOwnProperty.call(this.collections, name) ?
+ this.collections[name].length : 0;
+};
+
ClassList.prototype.set = function (name, node) {
if (Object.prototype.hasOwnProperty.call(this.collections, name)) {
this.collections[name].push(node);
|
[feature] add classlist count method
|
diff --git a/macaroons/constraints_test.go b/macaroons/constraints_test.go
index <HASH>..<HASH> 100644
--- a/macaroons/constraints_test.go
+++ b/macaroons/constraints_test.go
@@ -99,7 +99,7 @@ func TestIpLockConstraint(t *testing.T) {
// TestIPLockBadIP tests that an IP constraint cannot be added if the
// provided string is not a valid IP address.
func TestIPLockBadIP(t *testing.T) {
- constraintFunc := macaroons.IPLockConstraint("127.0.0/800");
+ constraintFunc := macaroons.IPLockConstraint("127.0.0/800")
testMacaroon := createDummyMacaroon(t)
err := constraintFunc(testMacaroon)
if err == nil {
|
macaroons/constraints_test: remove extraneous semicolon
|
diff --git a/stemcell/stemcell.go b/stemcell/stemcell.go
index <HASH>..<HASH> 100644
--- a/stemcell/stemcell.go
+++ b/stemcell/stemcell.go
@@ -3,7 +3,7 @@ package stemcell
import (
"fmt"
- boshcmd "github.com/cloudfoundry/bosh-utils/fileutil"
+ boshfu "github.com/cloudfoundry/bosh-utils/fileutil"
biproperty "github.com/cloudfoundry/bosh-utils/property"
boshsys "github.com/cloudfoundry/bosh-utils/system"
@@ -29,7 +29,7 @@ type ExtractedStemcell interface {
type extractedStemcell struct {
manifest Manifest
extractedPath string
- compressor boshcmd.Compressor
+ compressor boshfu.Compressor
fs boshsys.FileSystem
}
@@ -46,7 +46,7 @@ type Manifest struct {
func NewExtractedStemcell(
manifest Manifest,
extractedPath string,
- compressor boshcmd.Compressor,
+ compressor boshfu.Compressor,
fs boshsys.FileSystem,
) ExtractedStemcell {
return &extractedStemcell{
@@ -102,7 +102,7 @@ func (s *extractedStemcell) Pack(destinationPath string) error {
return err
}
- return s.fs.Rename(intermediateStemcellPath, destinationPath)
+ return boshfu.NewFileMover(s.fs).Move(intermediateStemcellPath, destinationPath)
}
func (s *extractedStemcell) EmptyImage() error {
|
Fix bug in repack-stemcell
repack-stemcell failed when the specified target was on a different
device than the bosh cache. Fixed by using a different utility function
to move temporary tar ball to destination tar ball.
[#<I>](<URL>)
|
diff --git a/lib/specter.rb b/lib/specter.rb
index <HASH>..<HASH> 100644
--- a/lib/specter.rb
+++ b/lib/specter.rb
@@ -1,3 +1,7 @@
+require 'forwardable'
+require 'logger'
+require 'socket'
+
require 'specter/version'
require 'specter/cli'
require 'specter/server'
diff --git a/lib/specter/env.rb b/lib/specter/env.rb
index <HASH>..<HASH> 100644
--- a/lib/specter/env.rb
+++ b/lib/specter/env.rb
@@ -1,5 +1,3 @@
-require 'forwardable'
-
module Specter
class Env < Hash
extend Forwardable
diff --git a/lib/specter/server.rb b/lib/specter/server.rb
index <HASH>..<HASH> 100644
--- a/lib/specter/server.rb
+++ b/lib/specter/server.rb
@@ -1,9 +1,6 @@
-require 'socket'
-require 'logger'
-
+require 'specter/env'
require 'specter/middleware'
require 'specter/request'
-require 'specter/env'
module Specter
class Server
|
Move stdlib requirements to lib/specter.rb
|
diff --git a/src/Connection/Connector.php b/src/Connection/Connector.php
index <HASH>..<HASH> 100644
--- a/src/Connection/Connector.php
+++ b/src/Connection/Connector.php
@@ -76,9 +76,16 @@ class Connector implements ConnectorInterface
if (isset($session)) {
$this->session = $session;
} else {
- // Assign file storage to the session by default.
- $this->session = new Session();
- $this->session->setStorage(new File());
+ if ($this->config['api_token'] && $this->config['api_token_type'] === 'access') {
+ // If an access token is set directly, default to a session
+ // with no storage.
+ $this->session = new Session();
+ } else {
+ // Otherwise, assign file storage to the session by default.
+ // This reduces unnecessary access token refreshes.
+ $this->session = new Session();
+ $this->session->setStorage(new File());
+ }
}
}
|
Connector: default to no session storage when an access token is configured
|
diff --git a/hypermap/aggregator/models.py b/hypermap/aggregator/models.py
index <HASH>..<HASH> 100644
--- a/hypermap/aggregator/models.py
+++ b/hypermap/aggregator/models.py
@@ -1294,9 +1294,11 @@ def endpointlist_post_save(instance, *args, **kwargs):
def endpoint_post_save(instance, *args, **kwargs):
+ signals.post_save.disconnect(endpoint_post_save, sender=Endpoint)
if Endpoint.objects.filter(url=instance.url).count() == 0:
endpoint = Endpoint(url=instance.url)
endpoint.save()
+ signals.post_save.connect(endpoint_post_save, sender=Endpoint)
if not settings.SKIP_CELERY_TASK:
update_endpoint.delay(instance)
else:
|
Prevent recursion with same endpoint url (#<I>)
* Prevent recursion with same endpoint url
Found an issue. When a new endpoint list is added, an infinite loop with the first endpoint url from the file is generated.
<URL>
|
diff --git a/lib/vanity/adapters/mongodb_adapter.rb b/lib/vanity/adapters/mongodb_adapter.rb
index <HASH>..<HASH> 100644
--- a/lib/vanity/adapters/mongodb_adapter.rb
+++ b/lib/vanity/adapters/mongodb_adapter.rb
@@ -19,8 +19,8 @@ module Vanity
def initialize(options)
if options[:hosts]
- args = *options[:hosts].map{|host| [host, options[:port]] }
- @mongo = Mongo::ReplSetConnection.new(args, {:connect => false})
+ args = (options[:hosts].map{|host| [host, options[:port]] } << {:connect => false})
+ @mongo = Mongo::ReplSetConnection.new(*args)
else
@mongo = Mongo::Connection.new(options[:host], options[:port], :connect => false)
end
|
Fixed a bug after really using the fork in a proper environment.
|
diff --git a/tsdb/engine/bz1/bz1.go b/tsdb/engine/bz1/bz1.go
index <HASH>..<HASH> 100644
--- a/tsdb/engine/bz1/bz1.go
+++ b/tsdb/engine/bz1/bz1.go
@@ -598,7 +598,6 @@ func (tx *Tx) Cursor(key string) tsdb.Cursor {
c := &Cursor{
cursor: b.Cursor(),
- buf: make([]byte, DefaultBlockSize),
}
return tsdb.MultiCursor(walCursor, c)
|
Remove unused buffer allocation
The buffer allocation in bz1 was unused and I'm fairly certain that it
was harmful to performance if used. For queries that run through a bz1
block, needing to hold on to a <I>kb block is expensive. Better to churn
on the allocator and have the blocks be released when they are unused
than to have <I>kb hanging around for each series regardless of size.
|
diff --git a/openquake/commonlib/source.py b/openquake/commonlib/source.py
index <HASH>..<HASH> 100644
--- a/openquake/commonlib/source.py
+++ b/openquake/commonlib/source.py
@@ -365,7 +365,7 @@ class CompositionInfo(object):
"""
sm = self.source_models[sm_id]
return self.__class__(
- self.gsim_lt, self.seed, self.num_samples, [sm], self.tot_weight)
+ self.gsim_lt, self.seed, sm.samples, [sm], self.tot_weight)
def __getnewargs__(self):
# with this CompositionInfo instances will be unpickled correctly
|
Small fix in case of sampling
Former-commit-id: caedbc<I>e<I>e9fb<I>fca<I>d<I>cc<I>b4
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@ tests_require = [
'pytest-cache>=1.0',
'pytest-cov>=1.8.0',
'pytest-pep8>=1.0.6',
- 'pytest>=2.8.0,<3.0.0'
+ 'pytest>=3.8'
]
extras_require = {
|
installation: upgrade `pytest`
|
diff --git a/website/data/version.js b/website/data/version.js
index <HASH>..<HASH> 100644
--- a/website/data/version.js
+++ b/website/data/version.js
@@ -1,3 +1,3 @@
-export const VERSION = '1.4.1'
+export const VERSION = '1.4.2'
export const CHANGELOG_URL =
- 'https://github.com/hashicorp/vault/blob/master/CHANGELOG.md#141-april-30th-2020'
+ 'https://github.com/hashicorp/vault/blob/master/CHANGELOG.md#142-may-21st-2020'
|
update website for <I> (#<I>)
|
diff --git a/internetarchive/cli/ia_copy.py b/internetarchive/cli/ia_copy.py
index <HASH>..<HASH> 100644
--- a/internetarchive/cli/ia_copy.py
+++ b/internetarchive/cli/ia_copy.py
@@ -34,6 +34,7 @@ import sys
from docopt import docopt, printable_usage
from schema import Schema, Use, Or, And, SchemaError
+from six.moves.urllib import parse
import internetarchive as ia
from internetarchive.cli.argparser import get_args_dict
@@ -91,7 +92,7 @@ def main(argv, session, cmd='copy'):
print('{0}\n{1}'.format(str(exc), usage), file=sys.stderr)
sys.exit(1)
- args['--header']['x-amz-copy-source'] = '/{}'.format(src_path)
+ args['--header']['x-amz-copy-source'] = '/{}'.format(parse.quote(src_path))
args['--header']['x-amz-metadata-directive'] = 'COPY'
args['--header']
# Add keep-old-version by default.
|
urlencode/quote path in s3 copy-source header
|
diff --git a/docs/conf.py b/docs/conf.py
index <HASH>..<HASH> 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -46,10 +46,10 @@ copyright = u'2009, the django-authority team'
# built documents.
#
# The short X.Y version.
-version = '0.6'
+version = '0.7'
# The full version, including alpha/beta/rc tags.
-release = '0.6dev'
+release = '0.7dev'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ def read(fname):
setup(
name='django-authority',
- version='0.6',
+ version='0.7',
description=(
"A Django app that provides generic per-object-permissions "
"for Django's auth app."
|
Bumped to version <I>
|
diff --git a/lib/middleware/autoreload.js b/lib/middleware/autoreload.js
index <HASH>..<HASH> 100644
--- a/lib/middleware/autoreload.js
+++ b/lib/middleware/autoreload.js
@@ -18,7 +18,7 @@ var gaze = require('gaze'),
module.exports = function(options) {
var outdated = false,
- watches = [ path.join(process.cwd(), 'www/*') ];
+ watches = [ path.join(process.cwd(), 'www/**/*') ];
// optional options parameter
options = options || {};
|
[#<I>] Add subdirectory support to AutoReload.
|
diff --git a/wisdom-maven-plugin/src/main/java/org/ow2/chameleon/wisdom/maven/utils/DependencyFinder.java b/wisdom-maven-plugin/src/main/java/org/ow2/chameleon/wisdom/maven/utils/DependencyFinder.java
index <HASH>..<HASH> 100644
--- a/wisdom-maven-plugin/src/main/java/org/ow2/chameleon/wisdom/maven/utils/DependencyFinder.java
+++ b/wisdom-maven-plugin/src/main/java/org/ow2/chameleon/wisdom/maven/utils/DependencyFinder.java
@@ -73,6 +73,7 @@ public class DependencyFinder {
{
result = mojo.repoSystem.resolveArtifact( mojo.repoSession, request );
} catch ( ArtifactResolutionException e ) {
+ mojo.getLog().error("Cannot resolve " + groupId + ":" + artifact + ":" + version + ":" + type);
throw new MojoExecutionException( e.getMessage(), e );
}
|
Improve reporting when the runtime cannot be resolved
|
diff --git a/django_ulogin/models.py b/django_ulogin/models.py
index <HASH>..<HASH> 100644
--- a/django_ulogin/models.py
+++ b/django_ulogin/models.py
@@ -76,8 +76,8 @@ def create_user(request, ulogin_response):
Creates user
"""
# Custom behaviour
- if settings.CREATE_USER_CALLBACK is not None:
- callback = import_by_path(settings.CREATE_USER_CALLBACK)
+ if s.CREATE_USER_CALLBACK is not None:
+ callback = import_by_path(s.CREATE_USER_CALLBACK)
if callable(callback):
return callback(request=request, ulogin_response=ulogin_response)
raise ImproperlyConfigured("The ULOGIN_CREATE_USER_CALLBACK isn't a callable")
diff --git a/django_ulogin/settings.py b/django_ulogin/settings.py
index <HASH>..<HASH> 100644
--- a/django_ulogin/settings.py
+++ b/django_ulogin/settings.py
@@ -28,6 +28,7 @@ ALLOWED_PROVIDERS = (
('foursquare', _('Foursquare')),
('googleplus', _('Google+')),
('tumblr', _('Tumblr')),
+ ('dudu', _('Dudu')),
)
|
Fix some attribute errors;
added Dudu provier.
|
diff --git a/sos/collector/__init__.py b/sos/collector/__init__.py
index <HASH>..<HASH> 100644
--- a/sos/collector/__init__.py
+++ b/sos/collector/__init__.py
@@ -764,6 +764,7 @@ class SoSCollector(SoSComponent):
self.cluster = self.clusters['jbon']
else:
self.cluster = self.clusters[self.opts.cluster_type]
+ self.cluster_type = self.opts.cluster_type
self.cluster.master = self.master
else:
|
[collector] allow overriding plain --cluster-type
In few user scenarios, it is useful to force sos collect to override
cluster type, but let it generate list of nodes by itself. For that,
it is sufficient to set the self.cluster_type accordingly.
Resolves: #<I>
|
diff --git a/src/basis.js b/src/basis.js
index <HASH>..<HASH> 100644
--- a/src/basis.js
+++ b/src/basis.js
@@ -1946,14 +1946,18 @@
* @return {*}
*/
as: function(fn){
- var token = new Token(fn(this.value));
+ var token = new Token();
var setter = function(value){
- this.set(fn(value));
+ this.set(fn.call(this, value));
};
+
+ setter.call(token, this.get());
+
this.attach(setter, token, token.destroy);
token.attach($undef, this, function(){
this.detach(setter, token);
});
+
return token;
},
@@ -1970,6 +1974,9 @@
this.deferredToken = null;
}
+ this.attach = $undef;
+ this.detach = $undef;
+
var cursor = this;
while (cursor = cursor.handler)
if (cursor.destroy)
@@ -1977,8 +1984,6 @@
this.handler = null;
this.value = null;
- this.attach = $undef;
- this.detach = $undef;
}
});
|
core: basis.Token#as invoke fn in context of resulting token
|
diff --git a/test/unit/test_unit_before_after_test.rb b/test/unit/test_unit_before_after_test.rb
index <HASH>..<HASH> 100644
--- a/test/unit/test_unit_before_after_test.rb
+++ b/test/unit/test_unit_before_after_test.rb
@@ -182,7 +182,7 @@ class TestUnitBeforeAfter < Test::Unit::TestCase
"test_something(MyExampleTest):",
"RuntimeError: Error in 2nd before_setup",
"_test_file_temp.rb:10",
- "/hardmock/lib/test_unit_before_after.rb:136:in `call'"
+ "/hardmock/lib/test_unit_before_after.rb:", ":in `call'"
see_results :tests => 1, :assertions => 0, :failures => 0, :errors => 1
end
|
TestUnitBeforeAndAfter test was breaking due to fragile line-number-in-stack-trace expectations... removal of one line of source in Hardmock's source code broke this test's expectations.
git-svn-id: <URL>
|
diff --git a/napalm/ios/ios.py b/napalm/ios/ios.py
index <HASH>..<HASH> 100644
--- a/napalm/ios/ios.py
+++ b/napalm/ios/ios.py
@@ -442,6 +442,7 @@ class IOSDriver(NetworkDriver):
output = self._commit_hostname_handler(cmd)
if ('original configuration has been successfully restored' in output) or \
('error' in output.lower()) or \
+ ('not a valid config file' in output.lower()) or \
('failed' in output.lower()):
msg = "Candidate config could not be applied\n{}".format(output)
raise ReplaceConfigException(msg)
|
FIXES #<I> additional error message on failed replace (#<I>)
|
diff --git a/cli/src/main/java/org/jboss/as/cli/impl/aesh/cmd/deployment/ListCommand.java b/cli/src/main/java/org/jboss/as/cli/impl/aesh/cmd/deployment/ListCommand.java
index <HASH>..<HASH> 100644
--- a/cli/src/main/java/org/jboss/as/cli/impl/aesh/cmd/deployment/ListCommand.java
+++ b/cli/src/main/java/org/jboss/as/cli/impl/aesh/cmd/deployment/ListCommand.java
@@ -135,7 +135,7 @@ public class ListCommand extends CommandWithPermissions {
throw new CommandException("Failed to execute operation request.", e);
}
if (!result.hasDefined(Util.RESULT)) {
- return null;
+ throw new CommandException("Failed to read deployment information.");
}
return result.get(Util.RESULT);
}
|
[WFCORE-<I>] Improve CLI error handling in ListCommand
|
diff --git a/lib/knife-solo/ssh_command.rb b/lib/knife-solo/ssh_command.rb
index <HASH>..<HASH> 100644
--- a/lib/knife-solo/ssh_command.rb
+++ b/lib/knife-solo/ssh_command.rb
@@ -142,6 +142,7 @@ module KnifeSolo
def run_command(command, options={})
detect_authentication_method
+ Chef::Log.debug("Running command #{command}")
result = ExecResult.new
command = command.sub(/^\s*sudo/, 'sudo -p \'knife sudo password: \'')
Net::SSH.start(host, user, connection_options) do |ssh|
@@ -154,6 +155,7 @@ module KnifeSolo
if data =~ /^knife sudo password: /
ch.send_data("#{password}\n")
else
+ Chef::Log.debug("#{command} stdout: #{data}")
ui.stdout << data if options[:streaming]
result.stdout << data
end
@@ -161,6 +163,7 @@ module KnifeSolo
channel.on_extended_data do |ch, type, data|
next unless type == 1
+ Chef::Log.debug("#{command} stderr: #{data}")
ui.stderr << data if options[:streaming]
result.stderr << data
end
|
Get some debugging output on prepare.
|
diff --git a/pypet/utils/helpful_classes.py b/pypet/utils/helpful_classes.py
index <HASH>..<HASH> 100644
--- a/pypet/utils/helpful_classes.py
+++ b/pypet/utils/helpful_classes.py
@@ -40,7 +40,7 @@ class IteratorChain(object):
return self._current.next()
except IndexError:
# Chain is empty we have no more elements
- raise StopIteration
+ raise StopIteration('Reached end of iterator chain')
def __iter__(self):
while True:
|
added error statement to StopIteration
|
diff --git a/django_mailbox/transports/generic.py b/django_mailbox/transports/generic.py
index <HASH>..<HASH> 100644
--- a/django_mailbox/transports/generic.py
+++ b/django_mailbox/transports/generic.py
@@ -1,4 +1,5 @@
import sys
+import six
from .base import EmailTransport
@@ -9,9 +10,12 @@ class GenericFileMailbox(EmailTransport):
def __init__(self, path):
super(GenericFileMailbox, self).__init__()
- self._path = path.encode(
- sys.getfilesystemencoding()
- )
+ if six.PY2:
+ self._path = path.encode(
+ sys.getfilesystemencoding()
+ )
+ else:
+ self._path = path
def get_instance(self):
return self._variant(self._path)
|
possible fix for python3 maildir issue
|
diff --git a/core/cache/watcher.go b/core/cache/watcher.go
index <HASH>..<HASH> 100644
--- a/core/cache/watcher.go
+++ b/core/cache/watcher.go
@@ -4,6 +4,7 @@
package cache
import (
+ "regexp"
"sort"
"sync"
@@ -258,3 +259,37 @@ func (w *ChangeWatcher) changed(topic string, value interface{}) {
w.notify(strings)
}
+
+// RegexpChangeWatcher notifies when individual pieces of a subscribed topic
+// match the given compiled regular expression. An initial event is sent
+// with the input given at creation.
+type RegexpChangeWatcher struct {
+ *stringsWatcherBase
+
+ compiled *regexp.Regexp
+}
+
+func newRegexpAddRemoveWatcher(compiled *regexp.Regexp, values ...string) *RegexpChangeWatcher {
+ return &RegexpChangeWatcher{
+ stringsWatcherBase: newStringsWatcherBase(values...),
+ compiled: compiled,
+ }
+}
+
+func (w *RegexpChangeWatcher) changed(topic string, value interface{}) {
+ strings, ok := value.([]string)
+ if !ok {
+ logger.Errorf("programming error, value not of type []string")
+ }
+
+ matches := set.NewStrings()
+ for _, s := range strings {
+ if w.compiled.MatchString(s) {
+ matches.Add(s)
+ }
+ }
+
+ if !matches.IsEmpty() {
+ w.notify(matches.Values())
+ }
+}
|
Added RegexpChangeWatcher, tested by machine.WatchContainers.
|
diff --git a/publisher/static/publisher/publisher.js b/publisher/static/publisher/publisher.js
index <HASH>..<HASH> 100644
--- a/publisher/static/publisher/publisher.js
+++ b/publisher/static/publisher/publisher.js
@@ -1,16 +1,15 @@
var $ = django.jQuery;
$(function() {
- $('input:checkbox.publish-checkbox').change(function() {
- if ($(this).is(':checked')) {
- var url = $(this).data('publish');
- }
- else {
- var url = $(this).data('unpublish');
- }
- $.get(url, function(data) {
- if (data.success) {
- $('.published-icon').find('img').toggle();
- }
- });
- })
-})
+ $('input:checkbox.publish-checkbox').change(function() {
+ if ($(this).is(':checked')) {
+ var url = $(this).attr('data-publish');
+ } else {
+ var url = $(this).attr('data-unpublish');
+ }
+ $.get(url, function(data) {
+ if (data.success) {
+ $('.published-icon').find('img').toggle();
+ }
+ });
+ });
+});
|
Swapped from data attributes to standard attr call to fix undefined bug
|
diff --git a/proto/text.go b/proto/text.go
index <HASH>..<HASH> 100644
--- a/proto/text.go
+++ b/proto/text.go
@@ -334,7 +334,8 @@ func writeStruct(w *textWriter, sv reflect.Value) error {
}
inner := fv.Elem().Elem() // interface -> *T -> T
tag := inner.Type().Field(0).Tag.Get("protobuf")
- props.Parse(tag) // Overwrite the outer props.
+ props = new(Properties) // Overwrite the outer props var, but not its pointee.
+ props.Parse(tag)
// Write the value in the oneof, not the oneof itself.
fv = inner.Field(0)
|
Fix race in text formatting of oneof fields.
I was reparsing the oneof's struct field tag,
but not making a new Properties for it.
|
diff --git a/tag.go b/tag.go
index <HASH>..<HASH> 100644
--- a/tag.go
+++ b/tag.go
@@ -284,14 +284,14 @@ func (t *Tag) Save() error {
newFile.Close()
originalFile.Close()
- // Make sure we clean up the temp file if it's still around
- os.Remove(newFile.Name())
-
// Replace original file with new file
if err = os.Rename(newFile.Name(), originalFile.Name()); err != nil {
return err
}
+ // Make sure we clean up the temp file if it's still around
+ os.Remove(newFile.Name())
+
// Set t.file to new file with original name
t.file, err = os.Open(originalFile.Name())
if err != nil {
|
Fix bug with rename in tag.Save
|
diff --git a/packages/webiny-app-cms/src/editor/components/Droppable.js b/packages/webiny-app-cms/src/editor/components/Droppable.js
index <HASH>..<HASH> 100644
--- a/packages/webiny-app-cms/src/editor/components/Droppable.js
+++ b/packages/webiny-app-cms/src/editor/components/Droppable.js
@@ -35,7 +35,7 @@ const Droppable = pure(
}
return connectDropTarget(
- <div data-type="droppable">
+ <div data-type="droppable" style={{ position: "relative" }}>
{children({ isDragging, isOver, isDroppable: isDroppable(item) })}
</div>
);
|
Fixes out of bounds drop zone
|
diff --git a/js/examples/raindrops.js b/js/examples/raindrops.js
index <HASH>..<HASH> 100644
--- a/js/examples/raindrops.js
+++ b/js/examples/raindrops.js
@@ -104,7 +104,7 @@ example.start();
// Start the fps and raindrop count plot.
var fpsPlot = new SmoothieChart({tooltip:true});
fpsPlot.streamTo(document.getElementById("fpsPlot"), 1000);
-var countPlot = new SmoothieChart({tooltip:true});
+var countPlot = new SmoothieChart({tooltip:true, interpolation:'linear'});
countPlot.streamTo(document.getElementById("countPlot"), 1000);
var fpsLine = new TimeSeries();
var countLine = new TimeSeries();
@@ -114,9 +114,10 @@ setInterval(function() {
fpsLine.append(new Date().getTime(), example.getFPS());
}, 1000);
-// Add a raindrop 0.1 second.
+// Add a raindrop every 0.1 second, unless the fps dips below 21.
setInterval(function() {
- example.addRaindrop();
+ if (example.getFPS() > 20)
+ example.addRaindrop();
countLine.append(new Date().getTime(), example.numRaindrops());
}, 100);
|
Added a bound to the number of spawns, based on the fps.
|
diff --git a/src/Composer/Util/ProcessExecutor.php b/src/Composer/Util/ProcessExecutor.php
index <HASH>..<HASH> 100644
--- a/src/Composer/Util/ProcessExecutor.php
+++ b/src/Composer/Util/ProcessExecutor.php
@@ -33,6 +33,7 @@ class ProcessExecutor
public function execute($command, &$output = null)
{
$captureOutput = count(func_get_args()) > 1;
+ $this->errorOutput = null;
$process = new Process($command, null, null, null, static::getTimeout());
$process->run(function($type, $buffer) use ($captureOutput) {
if ($captureOutput) {
|
Reset the errorOutput before attempting to run command
|
diff --git a/gruvi/fibers.py b/gruvi/fibers.py
index <HASH>..<HASH> 100644
--- a/gruvi/fibers.py
+++ b/gruvi/fibers.py
@@ -47,6 +47,7 @@ class Fiber(fibers.Fiber):
self._log = logging.get_logger(self)
self._done = Signal()
self._thread = threading.get_ident()
+ self.context = None
@property
def name(self):
diff --git a/gruvi/logging.py b/gruvi/logging.py
index <HASH>..<HASH> 100644
--- a/gruvi/logging.py
+++ b/gruvi/logging.py
@@ -117,6 +117,7 @@ class ContextLogger(object):
return
prefix = [self.thread_info()]
prefix.append(self.stack_info() if self._debug else '')
+ prefix.append(getattr(fibers.current(), 'context', None) or '')
prefix.append(self.context)
while not prefix[-1]:
prefix.pop()
|
[logging] show a fiber context
|
diff --git a/jawn-core/src/main/java/net/javapla/jawn/core/FrameworkBootstrap.java b/jawn-core/src/main/java/net/javapla/jawn/core/FrameworkBootstrap.java
index <HASH>..<HASH> 100644
--- a/jawn-core/src/main/java/net/javapla/jawn/core/FrameworkBootstrap.java
+++ b/jawn-core/src/main/java/net/javapla/jawn/core/FrameworkBootstrap.java
@@ -291,9 +291,8 @@ public class FrameworkBootstrap {
} catch (Exception e) {
logger.debug("Error reading custom configuration. Going with built in defaults. The error was: " + getCauseMessage(e));
}
-
- return all;
}
+ return all;
} else {
logger.debug("Did not find custom configuration for {}. Going with built in defaults ", clazz);
}
|
looking for modules were exiting too early
|
diff --git a/examples/client.js b/examples/client.js
index <HASH>..<HASH> 100644
--- a/examples/client.js
+++ b/examples/client.js
@@ -2,7 +2,9 @@
const soupbintcp = require('../');
-const client = soupbintcp.createClient(4000, 'localhost', () => {
+const client = soupbintcp.createClient(4000, 'localhost');
+
+client.on('connect', () => {
client.login({
username: 'foo',
password: 'bar',
diff --git a/lib/Client.js b/lib/Client.js
index <HASH>..<HASH> 100644
--- a/lib/Client.js
+++ b/lib/Client.js
@@ -48,7 +48,12 @@ class Client extends EventEmitter {
this.emit('end');
});
- socket.connect(port, host, cb);
+ socket.connect(port, host, () => {
+ this.emit('connect');
+
+ if (cb)
+ cb();
+ });
}
login(payload, cb) {
|
Add 'connect' event for client
|
diff --git a/src/Autolinker.js b/src/Autolinker.js
index <HASH>..<HASH> 100644
--- a/src/Autolinker.js
+++ b/src/Autolinker.js
@@ -264,6 +264,8 @@ Autolinker.prototype = {
* @return {String} The HTML, with matches automatically linked.
*/
link : function( textOrHtml ) {
+ if( !textOrHtml ) { return ""; } // handle `null` and `undefined`
+
var htmlParser = this.getHtmlParser(),
htmlNodes = htmlParser.parse( textOrHtml ),
anchorTagStackCount = 0, // used to only process text around anchor tags, and any inner text/html they may have
diff --git a/tests/AutolinkerSpec.js b/tests/AutolinkerSpec.js
index <HASH>..<HASH> 100644
--- a/tests/AutolinkerSpec.js
+++ b/tests/AutolinkerSpec.js
@@ -47,6 +47,15 @@ describe( "Autolinker", function() {
} );
+ it( 'should return an empty string when provided `undefined` as its argument', function() {
+ expect( autolinker.link( undefined ) ).toBe( '' );
+ } );
+
+ it( 'should return an empty string when provided `null` as its argument', function() {
+ expect( autolinker.link( null ) ).toBe( '' );
+ } );
+
+
describe( "URL linking", function() {
describe( "protocol-prefixed URLs (i.e. URLs starting with http:// or https://)", function() {
|
Handle `null` or `undefined` being passed to the link() method by returning empty string.
|
diff --git a/grails-core/src/main/groovy/org/codehaus/groovy/grails/support/MockApplicationContext.java b/grails-core/src/main/groovy/org/codehaus/groovy/grails/support/MockApplicationContext.java
index <HASH>..<HASH> 100644
--- a/grails-core/src/main/groovy/org/codehaus/groovy/grails/support/MockApplicationContext.java
+++ b/grails-core/src/main/groovy/org/codehaus/groovy/grails/support/MockApplicationContext.java
@@ -332,7 +332,6 @@ public class MockApplicationContext extends GroovyObjectSupport implements WebAp
this.servletContext = servletContext;
}
- @Override
public Environment getEnvironment() {
return new org.springframework.web.context.support.DefaultWebEnvironment();
}
|
remove @Override from interface method
|
diff --git a/eventsourcing/domain/model/decorators.py b/eventsourcing/domain/model/decorators.py
index <HASH>..<HASH> 100644
--- a/eventsourcing/domain/model/decorators.py
+++ b/eventsourcing/domain/model/decorators.py
@@ -156,11 +156,12 @@ def attribute(getter):
raise ProgrammingError("Expected a function, got: {}".format(repr(getter)))
-def retry(exc=Exception, max_attempts=1, wait=0):
+def retry(exc=Exception, max_attempts=1, wait=0, stall=0):
def _retry(func):
@wraps(func)
def wrapper(*args, **kwargs):
+ sleep(stall)
attempts = 0
while True:
try:
|
Changed retry decorator to support 'stall' delay before looping.
|
diff --git a/resources/views/adminarea/partials/timestamps.blade.php b/resources/views/adminarea/partials/timestamps.blade.php
index <HASH>..<HASH> 100644
--- a/resources/views/adminarea/partials/timestamps.blade.php
+++ b/resources/views/adminarea/partials/timestamps.blade.php
@@ -1,5 +1,11 @@
<div style="padding-top: 5px;">
@if($model->exists)
+ <small>
+ <strong>{{ trans('cortex/foundation::common.id') }}:</strong> {{ $model->getKey() }}
+ </small>
+
+ @if($model->created_at || $model->updated_at) | @endif
+
@if($model->created_at)
<small>
<strong>{{ trans('cortex/foundation::common.created_at') }}:</strong>
|
Display record ID in form footer for admins
|
diff --git a/builtin/providers/aws/resource_aws_elb_test.go b/builtin/providers/aws/resource_aws_elb_test.go
index <HASH>..<HASH> 100644
--- a/builtin/providers/aws/resource_aws_elb_test.go
+++ b/builtin/providers/aws/resource_aws_elb_test.go
@@ -425,7 +425,7 @@ resource "aws_elb" "bar" {
const testAccAWSELBConfigHealthCheck = `
resource "aws_elb" "bar" {
name = "foobar-terraform-test"
- availability_zones = ["us-west-2a"]
+ availability_zones = ["us-west-2a", "us-west-2b", "us-west-2c"]
listener {
instance_port = 8000
|
providers/aws: fix ELB acceptance test
|
diff --git a/src/Context/FOSRestFormValidationContext.php b/src/Context/FOSRestFormValidationContext.php
index <HASH>..<HASH> 100644
--- a/src/Context/FOSRestFormValidationContext.php
+++ b/src/Context/FOSRestFormValidationContext.php
@@ -13,6 +13,7 @@ class FOSRestFormValidationContext extends RawApiContext
{
/**
* @Then /^the JSON response should have the error "([^"]*)" at "([^"]*)"$/
+ * @Then /^the JSON response should have the error '([^']*)' at "([^"]*)"$/
*/
public function theJSONResponseShouldHaveTheErrorAt(string $errorMessage, string $formChildFieldDescriptor)
{
|
Added additional quote format for FOSRest JSON response check
|
diff --git a/lib/down/chunked_io.rb b/lib/down/chunked_io.rb
index <HASH>..<HASH> 100644
--- a/lib/down/chunked_io.rb
+++ b/lib/down/chunked_io.rb
@@ -36,6 +36,8 @@ module Down
@rewindable = rewindable
@buffer = nil
@position = 0
+ @next_chunk = nil
+ @closed = false
retrieve_chunk # fetch first chunk so that we know whether the file is empty
end
diff --git a/test/support/warnings.rb b/test/support/warnings.rb
index <HASH>..<HASH> 100644
--- a/test/support/warnings.rb
+++ b/test/support/warnings.rb
@@ -1,3 +1,4 @@
require "warning"
+Warning.process('', /instance variable @\w+ not initialized/ => :raise)
Warning.ignore(/interpreted as argument prefix/, Gem::Specification.find_by_name("http-parser").load_paths.first)
|
Remove uninitialized @next_chunk and @closed warnings
Fixes #<I>
|
diff --git a/werkzeug/_reloader.py b/werkzeug/_reloader.py
index <HASH>..<HASH> 100644
--- a/werkzeug/_reloader.py
+++ b/werkzeug/_reloader.py
@@ -40,11 +40,16 @@ def _iter_module_files():
entered.add(path_entry)
try:
for filename in os.listdir(path_entry):
- if not filename.endswith(('.py', '.pyc', '.pyo')):
- continue
- filename = _verify_file(os.path.join(path_entry, filename))
- if filename:
- yield filename
+ path = os.path.join(path_entry, filename)
+ if os.path.isdir(path):
+ for filename in _recursive_walk(path):
+ yield filename
+ else:
+ if not filename.endswith(('.py', '.pyc', '.pyo')):
+ continue
+ filename = _verify_file(path)
+ if filename:
+ yield filename
except OSError:
pass
|
Make _recursive_walk actually recursive
|
diff --git a/monero_serialize/xmrboost.py b/monero_serialize/xmrboost.py
index <HASH>..<HASH> 100644
--- a/monero_serialize/xmrboost.py
+++ b/monero_serialize/xmrboost.py
@@ -32,6 +32,9 @@ async def load_uvarint(reader):
result = 0
shift = 0
+ if size > 8:
+ raise ValueError('Varint size too big')
+
# TODO: endianity, rev bytes if needed
for _ in range(size):
await reader.areadinto(buffer)
|
boost: varint unserialize range check
- too big varint is probably an invalid deserialization, maximum allowed is 8 B
|
diff --git a/pkg/k8s/factory_functions.go b/pkg/k8s/factory_functions.go
index <HASH>..<HASH> 100644
--- a/pkg/k8s/factory_functions.go
+++ b/pkg/k8s/factory_functions.go
@@ -134,12 +134,22 @@ func ObjToSlimCNP(obj interface{}) *types.SlimCNP {
func ObjTov1Pod(obj interface{}) *slim_corev1.Pod {
pod, ok := obj.(*slim_corev1.Pod)
- if !ok {
- log.WithField(logfields.Object, logfields.Repr(obj)).
- Warn("Ignoring invalid k8s v1 Pod")
- return nil
+ if ok {
+ return pod
+ }
+ deletedObj, ok := obj.(cache.DeletedFinalStateUnknown)
+ if ok {
+ // Delete was not observed by the watcher but is
+ // removed from kube-apiserver. This is the last
+ // known state and the object no longer exists.
+ pod, ok := deletedObj.Obj.(*slim_corev1.Pod)
+ if ok {
+ return pod
+ }
}
- return pod
+ log.WithField(logfields.Object, logfields.Repr(obj)).
+ Warn("Ignoring invalid k8s v1 Pod")
+ return nil
}
func ObjToV1Node(obj interface{}) *slim_corev1.Node {
|
pkg/k8s: cast to Pod even if obj is cache.DeletedFinalStateUnknown
When casting to a Pod, the k8s watcher might send a
cache.DeletedFinalStateUnknown object to the event handler. Since the
converter is not expecting this type, it will cause a warning to be
printed in the logs which will be unexpected for users. This commit
adds the ability for the function converter to cast the objects from
cache.DeletedFinalStateUnknown to avoid printing such warning.
|
diff --git a/mod/quiz/report/statistics/qstats.php b/mod/quiz/report/statistics/qstats.php
index <HASH>..<HASH> 100644
--- a/mod/quiz/report/statistics/qstats.php
+++ b/mod/quiz/report/statistics/qstats.php
@@ -89,12 +89,6 @@ class qstats{
$stats->covariancemaxsum += $sortedgradedifference * $sortedothergradedifference;
$stats->covariancewithoverallgradesum += $gradedifference * $overallgradedifference;
- if ($stats->subquestion){
- $question =& $this->subquestions[$stats->questionid];
- } else {
- $question =& $this->questions[$stats->questionid];
- }
-
}
function add_response_detail_to_array($responsedetail){
|
MDL-<I> "quiz stats report:Seperation of functionality and unit tests for calculations" forgot to remove this, now redundant, piece of code.
|
diff --git a/ghost/admin/app/components/gh-post-settings-menu/email.js b/ghost/admin/app/components/gh-post-settings-menu/email.js
index <HASH>..<HASH> 100644
--- a/ghost/admin/app/components/gh-post-settings-menu/email.js
+++ b/ghost/admin/app/components/gh-post-settings-menu/email.js
@@ -84,7 +84,7 @@ export default Component.extend({
return yield this.ajax.post(url, options);
} catch (error) {
if (error) {
- this.notifications.showAPIError(error, {key: 'send.previewEmail'});
+ this.set('sendTestEmailError', 'Error sending mail, please check your mailgun config');
}
}
}).drop()
|
Updated send test mail error for mailgun
no issue
|
diff --git a/lib/howitzer/capybara/settings.rb b/lib/howitzer/capybara/settings.rb
index <HASH>..<HASH> 100644
--- a/lib/howitzer/capybara/settings.rb
+++ b/lib/howitzer/capybara/settings.rb
@@ -266,6 +266,7 @@ module Capybara
Capybara.run_server = false
Capybara.app_host = ''
+ Capybara.asset_host = app_base_url
Capybara.default_wait_time = settings.timeout_small
Capybara.ignore_hidden_elements = true
Capybara.visible_text_only = true
|
Added capybara asset host to settings
|
diff --git a/pymzn/_mzn/_minizinc.py b/pymzn/_mzn/_minizinc.py
index <HASH>..<HASH> 100644
--- a/pymzn/_mzn/_minizinc.py
+++ b/pymzn/_mzn/_minizinc.py
@@ -146,6 +146,8 @@ def minizinc(mzn, *dzn_files, data=None, keep=False, output_base=None,
elif mzn_model.mzn_file:
output_dir, mzn_name = os.path.split(mzn_file)
output_prefix, mzn_ext = os.path.split(mzn_name)
+ else:
+ output_dir = os.getcwd()
output_prefix += '_'
output_file = NamedTemporaryFile(dir=output_dir, prefix=output_prefix,
suffix='.mzn', delete=False, mode='w+',
|
minizinc: use current working directory if keep=True but a model string is used
|
diff --git a/pkg/cloudprovider/providers/azure/azure_loadbalancer.go b/pkg/cloudprovider/providers/azure/azure_loadbalancer.go
index <HASH>..<HASH> 100644
--- a/pkg/cloudprovider/providers/azure/azure_loadbalancer.go
+++ b/pkg/cloudprovider/providers/azure/azure_loadbalancer.go
@@ -538,6 +538,10 @@ func (az *Cloud) reconcileLoadBalancer(lb network.LoadBalancer, fipConfiguration
}
}
+ loadDistribution := network.Default
+ if service.Spec.SessionAffinity == v1.ServiceAffinityClientIP {
+ loadDistribution = network.SourceIP
+ }
expectedRules[i] = network.LoadBalancingRule{
Name: &lbRuleName,
LoadBalancingRulePropertiesFormat: &network.LoadBalancingRulePropertiesFormat{
@@ -551,6 +555,7 @@ func (az *Cloud) reconcileLoadBalancer(lb network.LoadBalancer, fipConfiguration
Probe: &network.SubResource{
ID: to.StringPtr(az.getLoadBalancerProbeID(lbName, lbRuleName)),
},
+ LoadDistribution: loadDistribution,
FrontendPort: to.Int32Ptr(port.Port),
BackendPort: to.Int32Ptr(port.Port),
EnableFloatingIP: to.BoolPtr(true),
|
azure: loadbalancer: respect svc sessionaffinity
If the Service spec sets sessionAffinity, reflects that in the
configuration specified for the Azure loadbalancer.
|
diff --git a/smmap/__init__.py b/smmap/__init__.py
index <HASH>..<HASH> 100644
--- a/smmap/__init__.py
+++ b/smmap/__init__.py
@@ -3,7 +3,7 @@
__author__ = "Sebastian Thiel"
__contact__ = "byronimo@gmail.com"
__homepage__ = "https://github.com/Byron/smmap"
-version_info = (0, 8, 1)
+version_info = (0, 8, 2)
__version__ = '.'.join(str(i) for i in version_info)
# make everything available in root package for convenience
|
Bumped version to <I>
|
diff --git a/src/TestCase.php b/src/TestCase.php
index <HASH>..<HASH> 100644
--- a/src/TestCase.php
+++ b/src/TestCase.php
@@ -21,6 +21,7 @@ abstract class TestCase extends BaseTestCase
{
$loop = LoopFactory::create();
$container = ContainerBuilder::buildDevContainer();
+ $container->set(LoopInterface::class, $loop);
$container->set(CommandBus::class, $this->createCommandBus($loop));
return Factory::create($container, [
Options::NAMESPACE => '',
|
Added missing setting of loop into container on hydrate
|
diff --git a/easybatch-core/src/main/java/org/easybatch/core/impl/Engine.java b/easybatch-core/src/main/java/org/easybatch/core/impl/Engine.java
index <HASH>..<HASH> 100755
--- a/easybatch-core/src/main/java/org/easybatch/core/impl/Engine.java
+++ b/easybatch-core/src/main/java/org/easybatch/core/impl/Engine.java
@@ -132,7 +132,7 @@ public final class Engine implements Callable<Report> {
//read next record
Record currentRecord;
try {
- currentRecord = recordReader.readNextRecord();
+ currentRecord = readRecord();
} catch (Exception e) {
eventManager.fireOnBatchException(e);
eventManager.fireOnRecordReadException(e);
|
call readRecord method to fire pre/post reading events
|
diff --git a/cppman/Config.py b/cppman/Config.py
index <HASH>..<HASH> 100644
--- a/cppman/Config.py
+++ b/cppman/Config.py
@@ -23,8 +23,9 @@
#
import ConfigParser
+import os
-from os.path import exists
+from os.path import dirname, exists
class Config(object):
def __init__(self, configfile):
@@ -48,6 +49,10 @@ class Config(object):
def set_default(self):
"""Set config to default."""
+ try:
+ os.makedirs(dirname(self._configfile))
+ except: pass
+
self._config = ConfigParser.RawConfigParser()
self._config.add_section('Settings')
self._config.set('Settings', 'UpdateManPath', 'false')
@@ -58,6 +63,10 @@ class Config(object):
def store_config(self):
"""Store config back to file."""
+ try:
+ os.makedirs(dirname(self._configfile))
+ except: pass
+
with open(self._configfile, 'w') as f:
self._config.write(f)
|
Fix bug: config dir doesn't get created of doesn't exists.
|
diff --git a/gulpfile.js b/gulpfile.js
index <HASH>..<HASH> 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -750,6 +750,7 @@ gulp.task('build.dart', function(done) {
'build/pubspec.dart',
'build/analyze.dart',
'build/pubbuild.dart',
+ 'build.dart.material.css',
sequenceComplete(done)
);
});
@@ -1050,14 +1051,16 @@ gulp.task('build.dart2js.material', function(done) {
runSequence('build.dart', 'build.css.material', sequenceComplete(done));
});
-// TODO: this target is temporary until we find a way to use the SASS transformer
-gulp.task('build.dart.material', ['build/packages.dart'], function() {
+gulp.task('build.dart.material.css', function() {
return gulp.src('dist/dart/angular2_material/src/**/*.scss')
.pipe(sass())
.pipe(autoprefixer())
.pipe(gulp.dest('dist/dart/angular2_material/lib/src'));
});
+gulp.task('build.dart.material', ['build/packages.dart'], function(done) {
+ runSequence('build/packages.dart', 'build.dart.material.css', sequenceComplete(done))
+});
gulp.task('cleanup.builder', function() {
return angularBuilder.cleanup();
|
chore(build): add material css to dart build.
|
diff --git a/sovrin_client/client/wallet/wallet.py b/sovrin_client/client/wallet/wallet.py
index <HASH>..<HASH> 100644
--- a/sovrin_client/client/wallet/wallet.py
+++ b/sovrin_client/client/wallet/wallet.py
@@ -68,6 +68,10 @@ class Wallet(PWallet, TrustAnchoring):
:param raw: the wallet's raw representation of any version
:return: the wallet's raw representation of the current version
"""
+
+ # At first, call makeRawCompatible method of base class(es)
+ # if it contains such the method
+
rawClassVersion = raw.get(getClassVersionKey(Wallet), 0)
if rawClassVersion < 1:
Wallet.convertRawToVersion1(raw)
|
INDY-<I>: Added a comment
|
diff --git a/src/main/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPlugin.java b/src/main/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPlugin.java
index <HASH>..<HASH> 100644
--- a/src/main/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPlugin.java
+++ b/src/main/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPlugin.java
@@ -58,7 +58,7 @@ public class DependencyRecommendationsPlugin implements Plugin<Project> {
if (CORE_BOM_SUPPORT_ENABLED) {
logger.warn("coreBomSupport feature enabled");
recommendationProviderContainer.excludeConfigurations("archives", NEBULA_RECOMMENDER_BOM, "provided",
- "versionManagement", "resolutionRules", "bootArchives", "webapp");
+ "versionManagement", "resolutionRules", "bootArchives", "webapp", "checkstyle", "jacocoAgent", "jacocoAnt", "pmd", "findbugs", "spotbugs", "cobertura");
bomConfiguration.setCanBeResolved(false);
applyRecommendationsDirectly(project, bomConfiguration);
} else {
|
Exclude tools configurations from applying recommendatation from bom
|
diff --git a/code/Calendar.php b/code/Calendar.php
index <HASH>..<HASH> 100755
--- a/code/Calendar.php
+++ b/code/Calendar.php
@@ -120,7 +120,6 @@ class Calendar extends Page {
}
$f->addFieldToTab("Root.Main", new TextField('RSSTitle', _t('Calendar.RSSTITLE','Title of RSS Feed')),'Content');
- $this->extend('updateCMSFields',$f);
return $f;
}
|
BUGFIX: updateCMSFields() called multiple times
|
diff --git a/lib/ryodo/suffix_list_fetcher.rb b/lib/ryodo/suffix_list_fetcher.rb
index <HASH>..<HASH> 100644
--- a/lib/ryodo/suffix_list_fetcher.rb
+++ b/lib/ryodo/suffix_list_fetcher.rb
@@ -41,7 +41,8 @@ module Ryodo
def prepare_data
@prepared_data = @fetched_data.inject([]) do |acc, line|
- next(acc) if SKIPPABLE_LINE_REGEXP.match?(line)
+ # Using `Regexp#===` instead of `.match?`, to be compatible with Ruby 2.3 and older
+ next(acc) if SKIPPABLE_LINE_REGEXP === line # rubocop:disable Style/CaseEquality
acc << reverse_dn(line)
end.sort
end
|
Fix method issue (.match? exists in Ruby <I>+ only)
|
diff --git a/discord/channel.py b/discord/channel.py
index <HASH>..<HASH> 100644
--- a/discord/channel.py
+++ b/discord/channel.py
@@ -372,7 +372,7 @@ class TextChannel(discord.abc.Messageable, discord.abc.GuildChannel, Hashable):
async def purge(
self,
*,
- limit: int = 100,
+ limit: Optional[int] = 100,
check: Callable[[Message], bool] = MISSING,
before: Optional[SnowflakeTime] = None,
after: Optional[SnowflakeTime] = None,
diff --git a/discord/threads.py b/discord/threads.py
index <HASH>..<HASH> 100644
--- a/discord/threads.py
+++ b/discord/threads.py
@@ -366,7 +366,7 @@ class Thread(Messageable, Hashable):
async def purge(
self,
*,
- limit: int = 100,
+ limit: Optional[int] = 100,
check: Callable[[Message], bool] = MISSING,
before: Optional[SnowflakeTime] = None,
after: Optional[SnowflakeTime] = None,
|
Fix type annotations for purge's limit param on Thread/TextChannel
Optional was missing.
|
diff --git a/openquake/commonlib/tests/riskmodels_test.py b/openquake/commonlib/tests/riskmodels_test.py
index <HASH>..<HASH> 100644
--- a/openquake/commonlib/tests/riskmodels_test.py
+++ b/openquake/commonlib/tests/riskmodels_test.py
@@ -35,7 +35,7 @@ class ParseVulnerabilityModelTestCase(unittest.TestCase):
assetCategory="population"
lossCategory="fatalities">
<IML IMT="PGA">0.005 0.007 0.0098 0.0137</IML>
- <discreteVulnerability vulnerabilityFunctionID="A"
+ <discreteVulnerability vulnerabilityFunctionID="RC/A"
probabilisticDistribution="LN">
<lossRatio>0.01 0.06 0.18 0.36</lossRatio>
<coefficientsVariation>0.30 0.30 0.30 0.30
@@ -46,7 +46,7 @@ class ParseVulnerabilityModelTestCase(unittest.TestCase):
assetCategory="population"
lossCategory="fatalities">
<IML IMT="PGA">0.004 0.008 0.037</IML>
- <discreteVulnerability vulnerabilityFunctionID="B"
+ <discreteVulnerability vulnerabilityFunctionID="RC/B"
probabilisticDistribution="LN">
<lossRatio>0.01 0.06 0.18</lossRatio>
<coefficientsVariation>0.30 0.30 0.30
|
Used a slash in the vulnerabilityFunctionID
|
diff --git a/cumulusci/core/config.py b/cumulusci/core/config.py
index <HASH>..<HASH> 100644
--- a/cumulusci/core/config.py
+++ b/cumulusci/core/config.py
@@ -392,6 +392,10 @@ class OrgConfig(BaseConfig):
def org_id(self):
return self.id.split('/')[-2]
+ @property
+ def username(self):
+ return self.userinfo__preferred_username
+
def load_userinfo(self):
self._load_userinfo()
diff --git a/cumulusci/core/tasks.py b/cumulusci/core/tasks.py
index <HASH>..<HASH> 100644
--- a/cumulusci/core/tasks.py
+++ b/cumulusci/core/tasks.py
@@ -65,6 +65,10 @@ class BaseTask(object):
""" Log the beginning of the task execution """
self.logger.info('Beginning task: %s', self.__class__.__name__)
if self.org_config:
- self.logger.info('As user: %s', self.org_config.userinfo__preferred_username)
- self.logger.info('On org: %s', self.org_config.org_id)
+ self.logger.info(
+ '%15s %s',
+ 'As user:',
+ self.org_config.username
+ )
+ self.logger.info('%15s %s', 'In org:', self.org_config.org_id)
self.logger.info('')
|
properly print username for all org types, closes #<I>
|
diff --git a/services/purge_service_offering_test.go b/services/purge_service_offering_test.go
index <HASH>..<HASH> 100644
--- a/services/purge_service_offering_test.go
+++ b/services/purge_service_offering_test.go
@@ -80,6 +80,8 @@ var _ = Describe("Purging service offerings", func() {
AfterEach(func() {
app_helpers.AppReport(appName, DEFAULT_TIMEOUT)
+
+ Expect(cf.Cf("delete", appName, "-f", "-r").Wait(DEFAULT_TIMEOUT)).To(Exit(0))
})
})
})
|
Delete app in services test AfterEach
[#<I>]
|
diff --git a/lib/geminabox/server.rb b/lib/geminabox/server.rb
index <HASH>..<HASH> 100644
--- a/lib/geminabox/server.rb
+++ b/lib/geminabox/server.rb
@@ -156,7 +156,7 @@ module Geminabox
delete '/gems/*.gem' do
unless self.class.allow_delete?
- error_response(403, 'Gem deletion is disabled - see https://github.com/cwninja/geminabox/issues/115')
+ error_response(403, 'Gem deletion is disabled - see https://github.com/geminabox/geminabox/issues/115')
end
serialize_update do
|
Update link to issue
The location of geminabox changed to <URL>
|
diff --git a/salt/modules/mysql.py b/salt/modules/mysql.py
index <HASH>..<HASH> 100755
--- a/salt/modules/mysql.py
+++ b/salt/modules/mysql.py
@@ -271,7 +271,7 @@ def db_create(name):
# db doesnt exist, proceed
db = connect()
cur = db.cursor()
- query = "CREATE DATABASE %s;" % name
+ query = "CREATE DATABASE `%s`;" % name
log.debug("Query: {0}".format(query,))
if cur.execute( query ):
log.info("DB '{0}' created".format(name,))
@@ -298,7 +298,7 @@ def db_remove(name):
# db doesnt exist, proceed
db = connect()
cur = db.cursor()
- query = "DROP DATABASE %s;" % name
+ query = "DROP DATABASE `%s`;" % name
log.debug("Doing query: {0}".format(query,))
cur.execute( query )
|
added escaping for CREATE/DROP DATABASE
|
diff --git a/command/agent/command.go b/command/agent/command.go
index <HASH>..<HASH> 100644
--- a/command/agent/command.go
+++ b/command/agent/command.go
@@ -720,6 +720,11 @@ Options:
-encrypt=key Provides the gossip encryption key
-join=1.2.3.4 Address of an agent to join at start time.
Can be specified multiple times.
+ -retry-join=1.2.3.4 Address of an agent to join at start time with
+ retries enabled. Can be specified multiple times.
+ -retry-interval=30s Time to wait between join attempts.
+ -retry-max=0 Maximum number of join attempts. Defaults to 0, which
+ will retry indefinitely.
-log-level=info Log level of the agent.
-node=hostname Name of this node. Must be unique in the cluster
-protocol=N Sets the protocol version. Defaults to latest.
|
command/agent: add help for retry join
|
diff --git a/optaplanner-core/src/main/java/org/optaplanner/core/api/solver/SolverJob.java b/optaplanner-core/src/main/java/org/optaplanner/core/api/solver/SolverJob.java
index <HASH>..<HASH> 100644
--- a/optaplanner-core/src/main/java/org/optaplanner/core/api/solver/SolverJob.java
+++ b/optaplanner-core/src/main/java/org/optaplanner/core/api/solver/SolverJob.java
@@ -31,7 +31,7 @@ public interface SolverJob<Solution_, ProblemId_> {
/**
* @return never null, a value given to {@link SolverManager#solveBatch(Object, Function, Consumer)}
- *or {@link SolverManager#solveObserving(Object, Function, Consumer)}
+ * or {@link SolverManager#solveObserving(Object, Function, Consumer)}
*/
ProblemId_ getProblemId();
|
Update optaplanner-core/src/main/java/org/optaplanner/core/api/solver/SolverJob.java
|
diff --git a/src/tables.minimap.js b/src/tables.minimap.js
index <HASH>..<HASH> 100644
--- a/src/tables.minimap.js
+++ b/src/tables.minimap.js
@@ -17,7 +17,7 @@
var $btns = $('<div class="tablesaw-advance minimap">');
var $dotNav = $('<ul class="tablesaw-advance-dots">').appendTo($btns);
var hideDot = "tablesaw-advance-dots-hide";
- var $headerCells = $table.find("thead th");
+ var $headerCells = $table.data("tablesaw")._getPrimaryHeaderCells();
// populate dots
$headerCells.each(function() {
|
Fixes minimap to only use primary header row (especially important if you have more than one header row)
|
diff --git a/src/daos/dao.php b/src/daos/dao.php
index <HASH>..<HASH> 100644
--- a/src/daos/dao.php
+++ b/src/daos/dao.php
@@ -39,7 +39,8 @@ abstract class Dao {
* Child classes need to implement get_by_criterion
*
* @abstract
- * @param $options
+ * @param array|null $options
+ * @return mixed
*/
abstract public function get_by_criterion( $options );
}
|
Update phpdoc notation on DAO
|
diff --git a/pkg/controller/petset/pet.go b/pkg/controller/petset/pet.go
index <HASH>..<HASH> 100644
--- a/pkg/controller/petset/pet.go
+++ b/pkg/controller/petset/pet.go
@@ -231,7 +231,9 @@ func (p *apiServerPetClient) getPVC(pvcName, pvcNamespace string) (*api.Persiste
if errors.IsNotFound(err) {
found = false
}
- if err != nil || !found {
+ if !found {
+ return nil, found, nil
+ } else if err != nil {
return nil, found, err
}
return pvc, true, nil
@@ -249,7 +251,8 @@ func (p *apiServerPetClient) SyncPVCs(pet *pcb) error {
for i, pvc := range pet.pvcs {
_, exists, err := p.getPVC(pvc.Name, pet.parent.Namespace)
if !exists {
- if err := p.createPVC(&pet.pvcs[i]); err != nil {
+ var err error
+ if err = p.createPVC(&pet.pvcs[i]); err != nil {
errMsg += fmt.Sprintf("Failed to create %v: %v", pvc.Name, err)
}
p.event(pet.parent, "Create", fmt.Sprintf("pvc: %v", pvc.Name), err)
|
Create event only if creation of PVC failed.
|
diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/hudson/FilePath.java
+++ b/core/src/main/java/hudson/FilePath.java
@@ -2988,7 +2988,7 @@ public final class FilePath implements SerializableOnlyOverRemoting {
private void writeObject(ObjectOutputStream oos) throws IOException {
Channel target = getChannelForSerialization();
if(channel!=target) {
- throw new IllegalStateException("Can't send a remote FilePath to a different remote channel");
+ throw new IllegalStateException("Can't send a remote FilePath to a different remote channel (current=" + channel + ", target=" + target + ")");
}
oos.defaultWriteObject();
|
[JENKINS-<I>] - Add some diagnostics for the failing channel comparison in FilePath
|
diff --git a/bin/ember-template-lint.js b/bin/ember-template-lint.js
index <HASH>..<HASH> 100755
--- a/bin/ember-template-lint.js
+++ b/bin/ember-template-lint.js
@@ -44,7 +44,7 @@ async function buildLinterOptions(workingDir, filePath, filename = '', isReading
}
function executeGlobby(workingDir, pattern, ignore) {
- let supportedExtensions = new Set(['.hbs', '.html', '.handlebars']);
+ let supportedExtensions = new Set(['.hbs', '.handlebars']);
// `--no-ignore-pattern` results in `ignorePattern === [false]`
let options =
|
task: Temporarily disabling html parsing for <I>
|
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/SimpleAuthenticator.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/SimpleAuthenticator.java
index <HASH>..<HASH> 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/SimpleAuthenticator.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/SimpleAuthenticator.java
@@ -18,7 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.server.auth;
-import org.apache.tinkerpop.gremlin.groovy.plugin.dsl.credential.CredentialGraph;
+import org.apache.tinkerpop.gremlin.groovy.jsr223.dsl.credential.CredentialGraph;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.io.IoCore;
|
Stopped using the deprecated CredentialsGraph
Switched to the non-deprecated one. CTR
|
diff --git a/lib/appium_lib/driver.rb b/lib/appium_lib/driver.rb
index <HASH>..<HASH> 100644
--- a/lib/appium_lib/driver.rb
+++ b/lib/appium_lib/driver.rb
@@ -321,8 +321,6 @@ module Appium
# https://code.google.com/p/selenium/source/browse/spec-draft.md?repo=mobile
@appium_device = @caps[:platformName]
@appium_device = @appium_device.is_a?(Symbol) ? @appium_device : @appium_device.downcase.strip.intern if @appium_device
- fail "platformName must be set. Not found in options: #{opts}" unless @appium_device
- fail 'platformName must be Android or iOS' unless [:android, :ios].include?(@appium_device)
# load common methods
extend Appium::Common
|
Do not check platformName in passed caps
|
diff --git a/src/modules/producer.js b/src/modules/producer.js
index <HASH>..<HASH> 100644
--- a/src/modules/producer.js
+++ b/src/modules/producer.js
@@ -132,12 +132,11 @@ function checkRpc(queue, msg, options) {
//reply to us if you receive this message!
options.replyTo = amqpRPCQueues[queue].queue;
- return publishOrSendToQueue.call(this, queue, msg, options)
- .then(() => {
+ if (publishOrSendToQueue.call(this, queue, msg, options)) {
//defered promise that will resolve when response is received
amqpRPCQueues[queue][corrId] = Promise.defer();
return amqpRPCQueues[queue][corrId].promise;
- });
+ }
});
}
|
Create defered promise on RPC only when message is truly sent
|
diff --git a/pymola/ast.py b/pymola/ast.py
index <HASH>..<HASH> 100644
--- a/pymola/ast.py
+++ b/pymola/ast.py
@@ -461,7 +461,7 @@ ImportFromClause.ast_spec = {
ElementModification.ast_spec = {
'component': Field(ComponentRef, ComponentRef()),
- 'modifications': FieldList([Primary, Expression, ClassModification], []),
+ 'modifications': FieldList([Primary, Expression, ClassModification, Array], []),
}
ShortClassDefinition.ast_spec = {
|
Allow element modifications to be of type Array
|
diff --git a/Kwf/Model/Abstract.php b/Kwf/Model/Abstract.php
index <HASH>..<HASH> 100644
--- a/Kwf/Model/Abstract.php
+++ b/Kwf/Model/Abstract.php
@@ -889,9 +889,13 @@ abstract class Kwf_Model_Abstract implements Kwf_Model_Interface
public function getColumnMappings($mapping)
{
- if (!isset($this->_columnMappings[$mapping])) {
+ if (!$this->hasColumnMappings($mapping)) {
throw new Kwf_Exception("unknown mapping: '$mapping'");
}
return $this->_columnMappings[$mapping];
}
+
+ public function hasColumnMappings($mapping) {
+ return isset($this->_columnMappings[$mapping]);
+ }
}
|
Model_Abstract: added hasColumnMappings(), needed for newsletter
|
diff --git a/src/View/View/ViewFinderInterface.php b/src/View/View/ViewFinderInterface.php
index <HASH>..<HASH> 100644
--- a/src/View/View/ViewFinderInterface.php
+++ b/src/View/View/ViewFinderInterface.php
@@ -30,8 +30,8 @@ interface ViewFinderInterface extends FinderInterface
*
* @since 0.1.0
*
- * @param array $criteria Criteria to search for.
- * @param EngineInterface $engine Optional. Engine to use with the view.
+ * @param array $criteria Criteria to search for.
+ * @param EngineInterface|null $engine Optional. Engine to use with the view.
*
* @return ViewInterface View that was found.
*/
|
Add `null` in typehint where needed.
|
diff --git a/structurizr-examples/src/com/structurizr/example/structurizr/UploadToStructurizr.java b/structurizr-examples/src/com/structurizr/example/structurizr/UploadToStructurizr.java
index <HASH>..<HASH> 100644
--- a/structurizr-examples/src/com/structurizr/example/structurizr/UploadToStructurizr.java
+++ b/structurizr-examples/src/com/structurizr/example/structurizr/UploadToStructurizr.java
@@ -3,6 +3,8 @@ package com.structurizr.example.structurizr;
import com.structurizr.Workspace;
import com.structurizr.api.StructurizrClient;
+import java.io.File;
+
public class UploadToStructurizr extends AbstractStructurizrWorkspace {
public static void main(String[] args) throws Exception {
@@ -12,6 +14,7 @@ public class UploadToStructurizr extends AbstractStructurizrWorkspace {
void run() throws Exception {
Workspace workspace = readFromFile();
StructurizrClient structurizrClient = new StructurizrClient();
+ structurizrClient.setWorkspaceArchiveLocation(new File(System.getProperty("user.home"), "structurizr-workspaces"));
structurizrClient.mergeWorkspace(121, workspace);
}
|
Save Structurizr workspaces to a persistent directory.
|
diff --git a/libcontainer/cgroups/systemd/systemd_test.go b/libcontainer/cgroups/systemd/systemd_test.go
index <HASH>..<HASH> 100644
--- a/libcontainer/cgroups/systemd/systemd_test.go
+++ b/libcontainer/cgroups/systemd/systemd_test.go
@@ -219,9 +219,6 @@ func TestFreezePodCgroup(t *testing.T) {
t.Fatal(err)
}
- if err := pm.Freeze(configs.Frozen); err != nil {
- t.Fatal(err)
- }
if err := pm.Set(podConfig.Resources); err != nil {
t.Fatal(err)
}
|
libct/cg/sd: TestFreezePodCgroup: rm explicit freeze
This was initially added by commit 3e5c<I>b<I>a because Set (with
r.Freezer = Frozen) was not able to freeze a container.
Now (see a few previous commits) Set can do the freeze, so the explicit
Freeze is no longer needed.
|
diff --git a/twemproxy/datadog_checks/twemproxy/twemproxy.py b/twemproxy/datadog_checks/twemproxy/twemproxy.py
index <HASH>..<HASH> 100644
--- a/twemproxy/datadog_checks/twemproxy/twemproxy.py
+++ b/twemproxy/datadog_checks/twemproxy/twemproxy.py
@@ -101,10 +101,11 @@ class Twemproxy(AgentCheck):
except Exception as e:
self.log.error('Could not submit metric: %s: %s', repr(row), e)
- if version is None:
- self.log.warning('Error collecting Twemproxy version')
- else:
- self.set_metadata('version', version)
+ if self.is_metadata_collection_enabled():
+ if version is None:
+ self.log.warning('Error collecting Twemproxy version')
+ else:
+ self.set_metadata('version', version)
def _get_data(self, instance):
host = instance.get('host')
|
Don't collect version if metadata is not enabled (#<I>)
* Collect metadata behind a flag
* Don't log if metadata isn't enabled
|
diff --git a/addon/components/as-side-panel.js b/addon/components/as-side-panel.js
index <HASH>..<HASH> 100644
--- a/addon/components/as-side-panel.js
+++ b/addon/components/as-side-panel.js
@@ -42,6 +42,14 @@ export default Ember.Component.extend(KeyEventsMixin, TransitionDurationMixin, I
this.sendAction('previous');
},
+ showDrawer: function() {
+ this.set('isDrawerActive', true);
+ },
+
+ hideDrawer: function() {
+ this.set('isDrawerActive', false);
+ },
+
toggleDrawer: function() {
this.toggleProperty('isDrawerActive');
}
|
Add showDrawer and hideDrawer actions to side panel
|
diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/github.py b/datadog_checks_dev/datadog_checks/dev/tooling/github.py
index <HASH>..<HASH> 100644
--- a/datadog_checks_dev/datadog_checks/dev/tooling/github.py
+++ b/datadog_checks_dev/datadog_checks/dev/tooling/github.py
@@ -90,9 +90,10 @@ def from_contributor(pr_payload):
def parse_pr_number(log_line):
- match = re.search(PR_PATTERN, log_line)
- if match:
- return match.group(1)
+ """If there are multiple matches, the PR id is always the latest one"""
+ matches = re.findall(PR_PATTERN, log_line)
+ if matches:
+ return matches[-1]
def parse_pr_numbers(git_log_lines):
|
Fix for parsing the PR id from commits
* Fix for PR name
* Fix variable name
|
diff --git a/irc.js b/irc.js
index <HASH>..<HASH> 100644
--- a/irc.js
+++ b/irc.js
@@ -224,7 +224,7 @@ function handleNotice(user, serverIdx, server, origin, targetName, text) {
}
} else {
// no nickname yet, so this is most likely an AUTH notice
- user.applyStateChange('Notice', server.toWindowPath(), origin.getNickOrName(), text);
+ user.applyStateChange('Text', server.toWindowPath(), '-' + origin.getNickOrName() + '- ' + text);
}
}
}
|
special treatment for server AUTH notices
|
diff --git a/networkapiclient/ApiInterface.py b/networkapiclient/ApiInterface.py
index <HASH>..<HASH> 100644
--- a/networkapiclient/ApiInterface.py
+++ b/networkapiclient/ApiInterface.py
@@ -39,7 +39,7 @@ class ApiInterfaceRequest(ApiGenericClient):
data = dict()
- return self.put(uri)
+ return self.put(uri, data)
def deploy_channel_config_sync(self, channel_id):
"""
@@ -49,4 +49,4 @@ class ApiInterfaceRequest(ApiGenericClient):
data = dict()
- return self.put(uri)
+ return self.put(uri, data)
diff --git a/networkapiclient/__init__.py b/networkapiclient/__init__.py
index <HASH>..<HASH> 100644
--- a/networkapiclient/__init__.py
+++ b/networkapiclient/__init__.py
@@ -16,6 +16,6 @@
MAJOR_VERSION = '0'
MINOR_VERSION = '6'
-PATCH_VERSION = '0'
+PATCH_VERSION = '1'
VERSION = '.'.join((MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION,))
|
put and post data variable in order not to send null data
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.