diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/saltcloud/clouds/joyent.py b/saltcloud/clouds/joyent.py
index <HASH>..<HASH> 100644
--- a/saltcloud/clouds/joyent.py
+++ b/saltcloud/clouds/joyent.py
@@ -219,9 +219,10 @@ def create(vm_):
deploy_kwargs['make_master'] = True
deploy_kwargs['master_pub'] = vm_['master_pub']
deploy_kwargs['master_pem'] = vm_['master_pem']
- master_conf = saltcloud.utils.master_conf_string(__opts__, vm_)
- if master_conf:
- deploy_kwargs['master_conf'] = master_conf
+ master_conf = saltcloud.utils.master_conf(__opts__, vm_)
+ deploy_kwargs['master_conf'] = saltcloud.utils.salt_config_to_yaml(
+ master_conf
+ )
if master_conf.get('syndic_master', None):
deploy_kwargs['make_syndic'] = True
|
Fix the logic for make_syndic in Joyent
|
diff --git a/tests/Helpers/Environment.php b/tests/Helpers/Environment.php
index <HASH>..<HASH> 100644
--- a/tests/Helpers/Environment.php
+++ b/tests/Helpers/Environment.php
@@ -12,6 +12,11 @@ class Environment
(new Dotenv(__DIR__.'/../../'))->load();
}
+ /**
+ * @param string $key Env var name to read
+ * @param mixed $default Optional default value
+ * @return string
+ */
public function read($key, $default = self::ENV_VAR_NOT_SET)
{
$result = getenv($key) ?: $default;
|
Added DocComments to Environment class
|
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index <HASH>..<HASH> 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -668,11 +668,7 @@ module ActiveRecord
copied
end
- # Determines the version number of the next migration
- # if the timestamped migrations are activated then the comparison with the current time is made
- # and then higer of the two values is selected
- # For non timestamped values, the simple numbers are used in the format of "057", "570"
-
+ # Determines the version number of the next migration.
def next_migration_number(number)
if ActiveRecord::Base.timestamped_migrations
[Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % number].max
|
copy edits [ci skip]
|
diff --git a/cmd/fluxd/main.go b/cmd/fluxd/main.go
index <HASH>..<HASH> 100644
--- a/cmd/fluxd/main.go
+++ b/cmd/fluxd/main.go
@@ -49,7 +49,7 @@ func main() {
kubernetesBearerTokenFile = fs.String("kubernetes-bearer-token-file", "", "Path to file containing Kubernetes Bearer Token file")
databaseDriver = fs.String("database-driver", "ql-mem", `Database driver name, e.g., "postgres"; the default is an in-memory DB`)
databaseSource = fs.String("database-source", "history.db", `Database source name; specific to the database driver (--database-driver) used. The default is an arbitrary, in-memory DB name`)
- repoURL = fs.String("repo-url", "", "Config repo URL, e.g. https://github.com/myorg/conf.git (required)")
+ repoURL = fs.String("repo-url", "", "Config repo URL, e.g. git@github.com:myorg/conf (required)")
repoKey = fs.String("repo-key", "", "SSH key file with commit rights to config repo")
repoPath = fs.String("repo-path", "", "Path within config repo to look for resource definition files")
)
|
Typical SSH-based git creds require <EMAIL> form
|
diff --git a/test/test_subprocess.rb b/test/test_subprocess.rb
index <HASH>..<HASH> 100644
--- a/test/test_subprocess.rb
+++ b/test/test_subprocess.rb
@@ -260,5 +260,21 @@ describe Subprocess do
end
(Time.now - start).must_be_close_to(2.0, 0.2)
end
+
+ it "doesn't leak children when throwing errors" do
+ lambda {
+ Subprocess.call(['/not/a/file', ':('])
+ }.must_raise(Errno::ENOENT)
+
+ ps_pid = 0
+ procs = Subprocess.check_output(['ps', '-o', 'pid ppid']) do |p|
+ ps_pid = p.pid
+ end
+
+ pid_table = procs.split("\n")[1..-1].map{ |l| l.split(' ').map(&:to_i) }
+ children = pid_table.find_all{ |pid, ppid| ppid == $$ && pid != ps_pid }
+
+ children.must_equal([])
+ end
end
end
|
Add test for leaking children on errors
This tests the behavior fixed by <I>f<I>d<I>e<I>e<I>c<I>bab0ded<I>e6b5c7.
|
diff --git a/src/client/pps.go b/src/client/pps.go
index <HASH>..<HASH> 100644
--- a/src/client/pps.go
+++ b/src/client/pps.go
@@ -26,7 +26,7 @@ const (
// amount of time in order to keep owning a chunk. In reality, pods send
// ContinueJob more often than that because they need to account for network
// latency.
- PPSLeasePeriod = 20 * time.Second
+ PPSLeasePeriod = 30 * time.Second
)
var (
|
Increase lease period
That way a pod needs to miss at least two heartbeats before the chunk is revoked.
|
diff --git a/src/viewmodel/prototype/register.js b/src/viewmodel/prototype/register.js
index <HASH>..<HASH> 100644
--- a/src/viewmodel/prototype/register.js
+++ b/src/viewmodel/prototype/register.js
@@ -14,7 +14,7 @@ export default function Viewmodel$register ( keypath, dependant, group = 'defaul
deps.push( dependant );
- if ( keypath === undefined ) {
+ if ( !keypath ) {
return;
}
|
keypaths shouldn't be falsey in viewmodel register
because it makes the node test fail, but not the same code in the browser?
|
diff --git a/devices/ledvance.js b/devices/ledvance.js
index <HASH>..<HASH> 100644
--- a/devices/ledvance.js
+++ b/devices/ledvance.js
@@ -167,4 +167,14 @@ module.exports = [
extend: extend.ledvance.light_onoff_brightness_colortemp_color({colorTempRange: [153, 370]}),
ota: ota.ledvance,
},
+{
+ zigbeeModel: ['CLA 60 DIM'],
+ model: '4058075728981',
+ vendor: 'LEDVANCE',
+ description: 'SMART+ Classic A E27 dimmable white',
+ extend: extend.ledvance.light_onoff_brightness(),
+ ota: ota.ledvance,
+
+ };
+
];
|
Add <I> (#<I>)
Added the new dimmable lamp product
|
diff --git a/jooby/src/main/java/org/jooby/Jooby.java b/jooby/src/main/java/org/jooby/Jooby.java
index <HASH>..<HASH> 100644
--- a/jooby/src/main/java/org/jooby/Jooby.java
+++ b/jooby/src/main/java/org/jooby/Jooby.java
@@ -1182,7 +1182,7 @@ public class Jooby implements Router, LifeCycle, Registry {
@Override
public <T> T require(final Key<T> type) {
- checkState(injector != null, "App didn't start yet");
+ checkState(injector != null, "Registry is not ready. Require calls are available at application startup time, see http://jooby.org/doc/#application-life-cycle");
return injector.getInstance(type);
}
|
Error "App didnot start yet" could be more helpful fix #<I>
|
diff --git a/mod/quiz/module.js b/mod/quiz/module.js
index <HASH>..<HASH> 100644
--- a/mod/quiz/module.js
+++ b/mod/quiz/module.js
@@ -256,6 +256,10 @@ M.mod_quiz.secure_window = {
// Left click on a button or similar. No worries.
return;
}
+ if (e.button == 1 && e.target.test('[contenteditable=true]')) {
+ // Left click in Atto or similar.
+ return;
+ }
e.halt();
},
|
MDL-<I> Impossible to click on Atto in a Quiz in 'Secure' mode.
|
diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ClasspathUriUtil.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ClasspathUriUtil.java
index <HASH>..<HASH> 100644
--- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ClasspathUriUtil.java
+++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/ClasspathUriUtil.java
@@ -22,6 +22,8 @@ public class ClasspathUriUtil {
public static final String CLASSPATH_SCHEME = "classpath";
public static boolean isClasspathUri(URI uri) {
+ if (uri == null)
+ return false;
String scheme = uri.scheme();
return CLASSPATH_SCHEME.equals(scheme);
}
|
[Xbase] introduced JvmModelCompleter to complete a JvmModel according to Java defaults.
|
diff --git a/lib/double_entry.rb b/lib/double_entry.rb
index <HASH>..<HASH> 100644
--- a/lib/double_entry.rb
+++ b/lib/double_entry.rb
@@ -96,7 +96,6 @@ module DoubleEntry
# to: savings_account,
# code: :save,
# )
- #
# @param amount [Money] The quantity of money to transfer from one account
# to the other.
# @option options :from [DoubleEntry::Account::Instance] Transfer money out
@@ -189,6 +188,11 @@ module DoubleEntry
# Identify the scopes with the given account identifier holding at least
# the provided minimum balance.
#
+ # @example Find users with at lease $1,000,000 in their savings accounts
+ # DoubleEntry.scopes_with_minimum_balance_for_account(
+ # Money.new(1_000_000_00),
+ # :savings
+ # ) # might return user ids: [ 1423, 12232, 34729 ]
# @param minimum_balance [Money] Minimum account balance a scope must have
# to be included in the result set.
# @param account_identifier [Symbol]
|
Example for DoubleEntry::scopes_with_minimum_balance_for_account
|
diff --git a/centrosome/neighmovetrack.py b/centrosome/neighmovetrack.py
index <HASH>..<HASH> 100644
--- a/centrosome/neighmovetrack.py
+++ b/centrosome/neighmovetrack.py
@@ -379,7 +379,7 @@ class NeighbourMovementTracking(object):
costs_list = [costs[i, j] for (i, j) in pairs]
- assignment = lapjv.lapjv(zip(*pairs)[0], zip(*pairs)[1], costs_list)
+ assignment = lapjv.lapjv(list(zip(*pairs))[0], list(zip(*pairs))[1], costs_list)
indexes = enumerate(list(assignment[0]))
|
Explicitly decompoze zip into a list
|
diff --git a/full/src/main/java/apoc/monitor/Kernel.java b/full/src/main/java/apoc/monitor/Kernel.java
index <HASH>..<HASH> 100644
--- a/full/src/main/java/apoc/monitor/Kernel.java
+++ b/full/src/main/java/apoc/monitor/Kernel.java
@@ -4,7 +4,7 @@ import apoc.Extended;
import apoc.result.KernelInfoResult;
import org.neo4j.common.DependencyResolver;
-import org.neo4j.configuration.helpers.DatabaseReadOnlyChecker;
+import org.neo4j.dbms.database.readonly.DatabaseReadOnlyChecker;
import org.neo4j.graphdb.GraphDatabaseService;
import org.neo4j.kernel.database.Database;
import org.neo4j.kernel.internal.GraphDatabaseAPI;
|
Fixed import package to account for pending refactor
|
diff --git a/lib/zk/logging.rb b/lib/zk/logging.rb
index <HASH>..<HASH> 100644
--- a/lib/zk/logging.rb
+++ b/lib/zk/logging.rb
@@ -21,7 +21,7 @@ module ZK
ch_root.add_appenders(serr)
end
- ch_root.level = ENV['ZK_DEBUG'] ? :debug : :error
+ ch_root.level = ENV['ZK_DEBUG'] ? :debug : :off
end
end
|
ok, i relent, no output by default
|
diff --git a/lib/manager/npm/post-update/index.js b/lib/manager/npm/post-update/index.js
index <HASH>..<HASH> 100644
--- a/lib/manager/npm/post-update/index.js
+++ b/lib/manager/npm/post-update/index.js
@@ -170,12 +170,7 @@ async function writeExistingFiles(config, packageFiles) {
if (packageFile.npmrc) {
logger.debug(`Writing .npmrc to ${basedir}`);
await fs.outputFile(upath.join(basedir, '.npmrc'), packageFile.npmrc);
- } else if (
- config.npmrc &&
- (packageFile.hasYarnLock ||
- packageFile.hasPackageLock ||
- config.lernaLockFile)
- ) {
+ } else if (config.npmrc) {
logger.debug('Writing repo .npmrc to package file dir');
await fs.outputFile(upath.join(basedir, '.npmrc'), config.npmrc);
}
|
fix: always write config.npmrc
|
diff --git a/modules/wyil/src/wyil/transforms/RuntimeAssertions.java b/modules/wyil/src/wyil/transforms/RuntimeAssertions.java
index <HASH>..<HASH> 100644
--- a/modules/wyil/src/wyil/transforms/RuntimeAssertions.java
+++ b/modules/wyil/src/wyil/transforms/RuntimeAssertions.java
@@ -362,7 +362,8 @@ public class RuntimeAssertions implements Transform<WyilFile> {
return null;
}
- protected Block findPrecondition(NameID name, Type.FunctionOrMethod fun,SyntacticElement elem) throws Exception {
+ protected Block findPrecondition(NameID name, Type.FunctionOrMethod fun,
+ SyntacticElement elem) throws Exception {
Path.Entry<WyilFile> e = builder.namespace().get(name.module(),WyilFile.ContentType);
if(e == null) {
syntaxError(
@@ -373,7 +374,8 @@ public class RuntimeAssertions implements Transform<WyilFile> {
WyilFile.MethodDeclaration method = m.method(name.name(),fun);
for(WyilFile.Case c : method.cases()) {
- // FIXME: this is a hack for now
+ // FIXME: this is a hack for now, since method cases don't do
+ // anything.
return c.precondition();
}
return null;
|
WYIL: minor tweak to documentation.
|
diff --git a/Classes/Core/Functional/FunctionalTestCase.php b/Classes/Core/Functional/FunctionalTestCase.php
index <HASH>..<HASH> 100644
--- a/Classes/Core/Functional/FunctionalTestCase.php
+++ b/Classes/Core/Functional/FunctionalTestCase.php
@@ -330,7 +330,7 @@ abstract class FunctionalTestCase extends BaseTestCase
$localConfiguration['DB']['Connections']['Default']['dbname'] = $dbName;
$localConfiguration['DB']['Connections']['Default']['wrapperClass'] = DatabaseConnectionWrapper::class;
$testbase->testDatabaseNameIsNotTooLong($originalDatabaseName, $localConfiguration);
- if ($dbDriver === 'mysqli') {
+ if ($dbDriver === 'mysqli' || $dbDriver === 'pdo_mysql') {
$localConfiguration['DB']['Connections']['Default']['charset'] = 'utf8mb4';
$localConfiguration['DB']['Connections']['Default']['tableoptions']['charset'] = 'utf8mb4';
$localConfiguration['DB']['Connections']['Default']['tableoptions']['collate'] = 'utf8mb4_unicode_ci';
|
[BUGFIX] Functional test driver sets utf8 with pdo_mysql
In addition to driver mysqli.
|
diff --git a/src/wa_kat/connectors/aleph.py b/src/wa_kat/connectors/aleph.py
index <HASH>..<HASH> 100755
--- a/src/wa_kat/connectors/aleph.py
+++ b/src/wa_kat/connectors/aleph.py
@@ -174,6 +174,16 @@ class Author(namedtuple("Author", ["name",
"alt_name"])):
@classmethod
def parse_author(cls, marc):
+ """
+ Parse author from `marc` data.
+
+ Args:
+ marc (obj): :class:`.MARCXMLRecord` instance. See module
+ :mod:`.marcxml_parser` for details.
+
+ Returns:
+ obj: :class:`Author`.
+ """
name = None
code = None
linked_forms = None
@@ -215,6 +225,15 @@ class Author(namedtuple("Author", ["name",
@classmethod
def search_by_name(cls, name):
+ """
+ Look for author in NK Aleph authority base by `name`.
+
+ Args:
+ name (str): Author's name.
+
+ Yields:
+ obj: :class:`Author` instances.
+ """
records = aleph.downloadRecords(
aleph.searchInAleph("aut", name, False, "wau")
)
|
#<I>: Updated aleph connector docstring.
|
diff --git a/lib/class/compositionEnumns.js b/lib/class/compositionEnumns.js
index <HASH>..<HASH> 100644
--- a/lib/class/compositionEnumns.js
+++ b/lib/class/compositionEnumns.js
@@ -22,7 +22,5 @@ module.exports.PluginManager = {
return manager;
},
- filterKeys: function(key) {
- return key === 'destroyPlugins';
- }
+ filterKeys: ['destroyPlugins']
};
\ No newline at end of file
|
move plugin manger to seperate file
|
diff --git a/chatterbot/constants.py b/chatterbot/constants.py
index <HASH>..<HASH> 100644
--- a/chatterbot/constants.py
+++ b/chatterbot/constants.py
@@ -4,10 +4,11 @@ ChatterBot constants
'''
The maximum length of characters that the text of a statement can contain.
-This should be enforced on a per-model basis by the data model for each
-storage adapter.
+The number 255 is used because that is the maximum length of a char field
+in most databases. This value should be enforced on a per-model basis by
+the data model for each storage adapter.
'''
-STATEMENT_TEXT_MAX_LENGTH = 400
+STATEMENT_TEXT_MAX_LENGTH = 255
'''
The maximum length of characters that the text label of a conversation can contain.
|
Change statement text max-length to <I>
|
diff --git a/parsl/monitoring/monitoring.py b/parsl/monitoring/monitoring.py
index <HASH>..<HASH> 100644
--- a/parsl/monitoring/monitoring.py
+++ b/parsl/monitoring/monitoring.py
@@ -246,6 +246,9 @@ class Hub(object):
hub_port=None,
hub_port_range=(55050, 56000),
+ database=None, # Zhuozhao, can you put in the right default here?
+ visualization_server=None, # Zhuozhao, can you put in the right default here?
+
client_address="127.0.0.1",
client_port=None,
@@ -292,6 +295,8 @@ class Hub(object):
self.hub_port = hub_port
self.hub_address = hub_address
+ self.database = database
+ self.visualization_server = visualization_server
self.loop_freq = 10.0 # milliseconds
|
Adding stubs for Db and Viz server
|
diff --git a/lib/jsdom/level2/html.js b/lib/jsdom/level2/html.js
index <HASH>..<HASH> 100644
--- a/lib/jsdom/level2/html.js
+++ b/lib/jsdom/level2/html.js
@@ -798,7 +798,7 @@ define('HTMLOptionElement', {
return closest(this, 'FORM');
},
get defaultSelected() {
- return !!this.getAttribute('selected');
+ return this.getAttribute('selected') !== null;
},
set defaultSelected(s) {
if (s) this.setAttribute('selected', 'selected');
|
Fix selected attribute
The element <option selected=""> is selected.
|
diff --git a/modules/stores/URLStore.js b/modules/stores/URLStore.js
index <HASH>..<HASH> 100644
--- a/modules/stores/URLStore.js
+++ b/modules/stores/URLStore.js
@@ -67,6 +67,9 @@ var URLStore = {
* Pushes the given path onto the browser navigation stack.
*/
push: function (path) {
+ if (path === _currentPath)
+ return;
+
if (_location === 'history') {
window.history.pushState({ path: path }, '', path);
notifyChange();
|
[changed] make URLStore.push idempotent
If somebody’s component is observing some user
input its easy to start pushing the same url
into the store, this makes it so devs can kind
of treat `Router.transitionTo` like rendering,
nothing happens if nothing has changed.
Previously, you get a bunch of history entries
that don’t change UI as the user clicks the back
button.
closes #<I>
|
diff --git a/lib/messaging/message/copy.rb b/lib/messaging/message/copy.rb
index <HASH>..<HASH> 100644
--- a/lib/messaging/message/copy.rb
+++ b/lib/messaging/message/copy.rb
@@ -21,7 +21,7 @@ module Messaging
receiver = receiver.build
end
- if include.nil?
+ if copy.nil? && include.nil?
include = source.class.attribute_names
end
|
Default attribute names for copy are corrected
|
diff --git a/concrete/bootstrap/process.php b/concrete/bootstrap/process.php
index <HASH>..<HASH> 100644
--- a/concrete/bootstrap/process.php
+++ b/concrete/bootstrap/process.php
@@ -66,7 +66,7 @@ if (isset($_REQUEST['ctask']) && $_REQUEST['ctask'] && $valt->validate()) {
case 'publish-now':
if ($cp->canApprovePageVersions()) {
$v = CollectionVersion::get($c, "SCHEDULED");
- $v->approve(false);
+ $v->approve(false, null);
header('Location: ' . \Core::getApplicationURL() . '/' . DISPATCHER_FILENAME .
'?cID=' . $c->getCollectionID());
|
Delete publish date when the user click "Publish Now" button
|
diff --git a/drivers/python/rethinkdb/__init__.py b/drivers/python/rethinkdb/__init__.py
index <HASH>..<HASH> 100644
--- a/drivers/python/rethinkdb/__init__.py
+++ b/drivers/python/rethinkdb/__init__.py
@@ -1,17 +1,15 @@
# Copyright 2010-2014 RethinkDB, all rights reserved.
+# Define this before importing so nothing can overwrite 'object'
+class r(object):
+ pass
+
from .net import *
from .query import *
from .errors import *
from .ast import *
from . import docs
-
-# The __builtins__ here defends against re-importing something
-# obscuring `object`.
-class r(__builtins__['object']):
- pass
-
for module in (net, query, ast, errors):
for functionName in module.__all__:
setattr(r, functionName, staticmethod(getattr(module, functionName)))
|
fixing compatibility for pypy - modules cannot be used as a dict
|
diff --git a/javacord-api/src/main/java/org/javacord/api/entity/user/User.java b/javacord-api/src/main/java/org/javacord/api/entity/user/User.java
index <HASH>..<HASH> 100644
--- a/javacord-api/src/main/java/org/javacord/api/entity/user/User.java
+++ b/javacord-api/src/main/java/org/javacord/api/entity/user/User.java
@@ -46,6 +46,7 @@ import org.javacord.api.listener.user.UserChangeStatusListener;
import org.javacord.api.listener.user.UserStartTypingListener;
import org.javacord.api.util.event.ListenerManager;
+import java.awt.Color;
import java.time.Instant;
import java.util.Collection;
import java.util.Collections;
@@ -418,6 +419,17 @@ public interface User extends DiscordEntity, Messageable, Mentionable, Updatable
}
/**
+ * Gets the displayed color of the user based on his roles in the given server.
+ *
+ * @param server The server.
+ * @return The color.
+ * @see Server#getRoleColor(User)
+ */
+ default Optional<Color> getRoleColor(Server server) {
+ return server.getRoleColor(this);
+ }
+
+ /**
* Gets if this user is the user of the connected account.
*
* @return Whether this user is the user of the connected account or not.
|
Added User#getRoleColor(Server)
|
diff --git a/command/v7/disable_service_access_command.go b/command/v7/disable_service_access_command.go
index <HASH>..<HASH> 100644
--- a/command/v7/disable_service_access_command.go
+++ b/command/v7/disable_service_access_command.go
@@ -52,7 +52,5 @@ func (cmd DisableServiceAccessCommand) displayMessage() error {
User: user.Name,
}.displayMessage(cmd.UI)
- cmd.UI.DisplayNewline()
-
return nil
}
diff --git a/command/v7/enable_service_access_command.go b/command/v7/enable_service_access_command.go
index <HASH>..<HASH> 100644
--- a/command/v7/enable_service_access_command.go
+++ b/command/v7/enable_service_access_command.go
@@ -54,8 +54,6 @@ func (cmd EnableServiceAccessCommand) displayMessage() error {
User: user.Name,
}.displayMessage(cmd.UI)
- cmd.UI.DisplayNewline()
-
return nil
}
|
Remove extra newlines before OK in commands
[#<I>](<URL>)
|
diff --git a/SingularityService/src/main/java/com/hubspot/singularity/scheduler/SingularityDeployChecker.java b/SingularityService/src/main/java/com/hubspot/singularity/scheduler/SingularityDeployChecker.java
index <HASH>..<HASH> 100644
--- a/SingularityService/src/main/java/com/hubspot/singularity/scheduler/SingularityDeployChecker.java
+++ b/SingularityService/src/main/java/com/hubspot/singularity/scheduler/SingularityDeployChecker.java
@@ -415,7 +415,7 @@ public class SingularityDeployChecker {
sendCancelToLoadBalancer(pendingDeploy);
}
- return getDeployResultWithFailures(request, deploy, pendingDeploy, DeployState.FAILED, String.format("Task(s) %s for this deploy failed", inactiveDeployMatchingTasks), inactiveDeployMatchingTasks);
+ return getDeployResultWithFailures(request, deploy, pendingDeploy, DeployState.FAILED, String.format("%s task(s) for this deploy failed", inactiveDeployMatchingTasks.size()), inactiveDeployMatchingTasks);
}
return checkDeployProgress(request, cancelRequest, pendingDeploy, updatePendingDeployRequest, deploy, deployActiveTasks, otherActiveTasks);
|
shorter high level message, detail will be in individual failures
|
diff --git a/src/components/messages/Messages.js b/src/components/messages/Messages.js
index <HASH>..<HASH> 100644
--- a/src/components/messages/Messages.js
+++ b/src/components/messages/Messages.js
@@ -4,7 +4,7 @@ import classNames from 'classnames';
export class Messages extends Component {
static defaultProps = {
- closable: false,
+ closable: true,
className: null,
style: null,
onClear: null
|
Closable default value changed from false to true
|
diff --git a/lib/ruboto/version.rb b/lib/ruboto/version.rb
index <HASH>..<HASH> 100644
--- a/lib/ruboto/version.rb
+++ b/lib/ruboto/version.rb
@@ -1,3 +1,3 @@
module Ruboto
- VERSION = '0.6.0.rc.0'
+ VERSION = '0.6.0.rc.1'
end
\ No newline at end of file
|
* Bumped versiopn to <I>.rc<I>
|
diff --git a/src/Slide.js b/src/Slide.js
index <HASH>..<HASH> 100644
--- a/src/Slide.js
+++ b/src/Slide.js
@@ -1,3 +1,5 @@
+import { Shape } from './Shape';
+
export class Slide {
/**
* Creates new Slide instance
@@ -13,6 +15,8 @@ export class Slide {
* @returns {Slide}
*/
addShape(shape) {
+ if (!(shape instanceof Shape)) throw new Error('You must provide Shape instance');
+
this._shapes.push(shape);
return this;
}
|
feat(shape): Adds checking for Shape instance when you add it to Slide
|
diff --git a/classes/PodsAPI.php b/classes/PodsAPI.php
index <HASH>..<HASH> 100644
--- a/classes/PodsAPI.php
+++ b/classes/PodsAPI.php
@@ -5396,7 +5396,8 @@ class PodsAPI {
$bypass_cache = false;
// Get current language data
- $lang_data = pods_i18n()->get_current_language_data();
+
+ $lang_data = PodsInit::$i18n->get_current_language_data();
if ( $lang_data ) {
if ( ! empty( $lang_data['language'] ) ) {
@@ -5699,7 +5700,7 @@ class PodsAPI {
$current_language = false;
// Get current language data
- $lang_data = pods_i18n()->get_current_language_data();
+ $lang_data = PodsInit::$i18n->get_current_language_data();
if ( $lang_data ) {
if ( ! empty( $lang_data['language'] ) ) {
|
I think the standard has been to access the singletons via `PodsInit`
|
diff --git a/droneapi/module/api.py b/droneapi/module/api.py
index <HASH>..<HASH> 100644
--- a/droneapi/module/api.py
+++ b/droneapi/module/api.py
@@ -24,11 +24,24 @@ class MPParameters(Parameters):
self.__module = module
def __getitem__(self, name):
+ self.wait_valid()
return self.__module.mav_param[name]
def __setitem__(self, name, value):
+ self.wait_valid()
self.__module.mpstate.functions.param_set(name, value)
+ def wait_valid(self):
+ '''Block the calling thread until parameters have been downloaded'''
+ # FIXME this is a super crufty spin-wait, also we should give the user the option of specifying a timeout
+ pstate = self.__param.pstate
+ while (pstate.mav_param_count == 0 or len(pstate.mav_param_set) != pstate.mav_param_count) and not self.__module.api.exit:
+ time.sleep(0.200)
+
+ @property
+ def __param(self):
+ return self.__module.module('param')
+
class MPCommandSequence(CommandSequence):
"""
See CommandSequence baseclass for documentation.
|
Wait on reading params until after they have been fetched from vehicle.
Fixes a bug reported by D Hugues.
|
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Export.php b/lib/Alchemy/Phrasea/Controller/Prod/Export.php
index <HASH>..<HASH> 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/Export.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/Export.php
@@ -297,7 +297,7 @@ class Export implements ControllerProviderInterface
$mail->setButtonUrl($url);
$mail->setExpiration($endDateObject);
- $app['notification.deliverer']->deliver($mail);
+ $app['notification.deliverer']->deliver($mail, !!$request->request->get('reading_confirm', false));
unset($remaingEmails[$key]);
}
|
Fix PHRAS-<I> acknowledgment of receipt is not setted
|
diff --git a/config/build.config.js b/config/build.config.js
index <HASH>..<HASH> 100644
--- a/config/build.config.js
+++ b/config/build.config.js
@@ -33,8 +33,6 @@ module.exports = {
docsAssets: {
js: [
'bower_components/angularytics/dist/angularytics.js',
- 'config/lib/angular-animate-sequence/angular-animate-sequence.js',
- 'config/lib/angular-animate-sequence/angular-animate-stylers.js',
'dist/angular-material.js',
'dist/docs/js/**/*.js'
],
@@ -63,6 +61,7 @@ module.exports = {
js: [
//Angular Animate Sequence
'config/lib/angular-animate-sequence/angular-animate-sequence.js',
+ 'config/lib/angular-animate-sequence/angular-animate-stylers.js',
//Utilities
'src/base/utils.js',
|
chore(build) - added animate-stylers to ngMaterial.
|
diff --git a/lib/plugins/load-plugin.js b/lib/plugins/load-plugin.js
index <HASH>..<HASH> 100644
--- a/lib/plugins/load-plugin.js
+++ b/lib/plugins/load-plugin.js
@@ -54,8 +54,7 @@ module.exports = function(options, callback) {
}
});
}
-
- var execPlugin = require(options.value);
+
var port, uiPort, rulesPort, resRulesPort, statusPort, tunnelRulesPort, tunnelPort;
var count = 0;
var callbackHandler = function() {
@@ -71,7 +70,13 @@ module.exports = function(options, callback) {
});
}
};
-
+
+ try {
+ require.resolve(options.value);
+ } catch(e) {
+ return callbackHandler();
+ }
+ var execPlugin = require(options.value);
var startServer = execPlugin.pluginServer || execPlugin.server || execPlugin;
if (typeof startServer == 'function') {
++count;
|
chore: Prevents modules from causing errors due to main methods
|
diff --git a/webpack.config.js b/webpack.config.js
index <HASH>..<HASH> 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -46,6 +46,7 @@ module.exports = {
],
},
resolve: {
+ root: path.resolve(__dirname, 'src'),
extensions: ['', '.js'],
},
output: {
|
webpack: change resolve root path configuration
|
diff --git a/lxd/storage/drivers/driver_types.go b/lxd/storage/drivers/driver_types.go
index <HASH>..<HASH> 100644
--- a/lxd/storage/drivers/driver_types.go
+++ b/lxd/storage/drivers/driver_types.go
@@ -8,6 +8,7 @@ type Info struct {
Remote bool // Whether the driver uses a remote backing store.
OptimizedImages bool // Whether driver stores images as separate volume.
OptimizedBackups bool // Whether driver supports optimized volume backups.
+ OptimizedBackupHeader bool // Whether driver generates an optimised backup header file in backup.
PreservesInodes bool // Whether driver preserves inodes when volumes are moved hosts.
BlockBacking bool // Whether driver uses block devices as backing store.
RunningQuotaResize bool // Whether quota resize is supported whilst instance running.
|
lxd/storage/drivers/driver/types: Adds OptimizedBackupHeader field to Info
Used to indicate if driver will generate a backup header file when generating an optimized backup file.
|
diff --git a/lib/commands/fastboot.js b/lib/commands/fastboot.js
index <HASH>..<HASH> 100644
--- a/lib/commands/fastboot.js
+++ b/lib/commands/fastboot.js
@@ -25,6 +25,7 @@ module.exports = {
});
var app = express();
+ app.get('/', server.middleware());
app.use(express.static('dist'));
app.get('/*', server.middleware());
|
need to serve the index from the middleware stack, so index.html doesn't override it.
(cherry picked from commit <I>f9d1a2a2a1c5a0ddc<I>f1eb<I>db0e<I>)
|
diff --git a/examples/nsapplescript.js b/examples/nsapplescript.js
index <HASH>..<HASH> 100644
--- a/examples/nsapplescript.js
+++ b/examples/nsapplescript.js
@@ -1,12 +1,21 @@
var $ = require('../')
+
+// import the "Foundation" framework and its dependencies
$.import('Foundation')
+// create the mandatory NSAutoreleasePool instance
var pool = $.NSAutoreleasePool('alloc')('init')
+// create an NSString of the applescript command that will be run
var command = $('tell (system info) to return system version')
+
+// create an NSAppleScript instance with the `command` NSString
var appleScript = $.NSAppleScript('alloc')('initWithSource', command)
+// finally execute the NSAppleScript instance synchronously
var resultObj = appleScript('executeAndReturnError', null)
+
+// resultObj may be null` or an NSAppleEventDescriptor instance , so check first
if (resultObj) {
console.dir(resultObj('stringValue').toString())
}
|
add some comments to the NSAppleScript example
|
diff --git a/caravel/views.py b/caravel/views.py
index <HASH>..<HASH> 100755
--- a/caravel/views.py
+++ b/caravel/views.py
@@ -686,8 +686,6 @@ appbuilder.add_view(
category_label=__("Security"),
icon='fa-table',)
-appbuilder.add_separator("Sources")
-
class DruidClusterModelView(CaravelModelView, DeleteMixin): # noqa
datamodel = SQLAInterface(models.DruidCluster)
@@ -2218,8 +2216,8 @@ appbuilder.add_view(
"CSS Templates",
label=__("CSS Templates"),
icon="fa-css3",
- category="Sources",
- category_label=__("Sources"),
+ category="Manage",
+ category_label=__("Manage"),
category_icon='')
appbuilder.add_link(
|
Moving 'CSS TEmplates' to the Manage menu category (#<I>)
|
diff --git a/ELiDE/ELiDE/board/pawnspot.py b/ELiDE/ELiDE/board/pawnspot.py
index <HASH>..<HASH> 100644
--- a/ELiDE/ELiDE/board/pawnspot.py
+++ b/ELiDE/ELiDE/board/pawnspot.py
@@ -40,7 +40,6 @@ class PawnSpot(ImageStack, Layout):
use_boardspace = True
positions = DictProperty()
_childs = DictProperty()
- _no_use_canvas = True
def __init__(self, **kwargs):
if 'proxy' in kwargs:
@@ -276,7 +275,6 @@ class PawnSpot(ImageStack, Layout):
self.positions = positions
def _position(self, *args):
- Logger.debug("PawnSpot: {} repositioning children".format(self.name))
x, y = self.pos
for member_id, (offx, offy) in self.positions.items():
self._childs[member_id].pos = x + offx, y + offy
|
Decruft the old unused _no_use_canvas property
It had meaning when I was doing tricky things with the pawn's canvas
|
diff --git a/lib/ethon/curls/classes.rb b/lib/ethon/curls/classes.rb
index <HASH>..<HASH> 100644
--- a/lib/ethon/curls/classes.rb
+++ b/lib/ethon/curls/classes.rb
@@ -17,15 +17,13 @@ module Ethon
# :nodoc:
class FDSet < ::FFI::Struct
- # XXX how does this work on non-windows? how can curl know the new size...
- FD_SETSIZE = ::Ethon::Libc.getdtablesize
-
if Curl.windows?
layout :fd_count, :u_int,
:fd_array, [:u_int, 64] # 2048 FDs
def clear; self[:fd_count] = 0; end
else
+ FD_SETSIZE = ::Ethon::Libc.getdtablesize
layout :fds_bits, [:long, FD_SETSIZE / ::FFI::Type::LONG.size]
# :nodoc:
|
Do not ask for getdtablesize on windows.
|
diff --git a/structr-ui/src/main/resources/structr/js/schema.js b/structr-ui/src/main/resources/structr/js/schema.js
index <HASH>..<HASH> 100644
--- a/structr-ui/src/main/resources/structr/js/schema.js
+++ b/structr-ui/src/main/resources/structr/js/schema.js
@@ -778,9 +778,23 @@ var _Schema = {
var stillUsed = false;
var normalizedKey = normalizeAttr(key);
Object.keys(entity).forEach(function(k) {
- if (entity[k] && (typeof entity[k] === 'string') && entity[k].contains(normalizedKey)) {
- stillUsed = true;
- return;
+ if (entity[k] && (typeof entity[k] === 'string')) {
+
+ // check views for usage of this property
+ if (k.startsWith('__')) {
+ var viewVars = entity[k].split(',');
+
+ viewVars.forEach(function(viewVar){
+
+ if (normalizeAttr(viewVar.trim()) === normalizedKey) {
+ stillUsed = true;
+ };
+ });
+
+ if (stillUsed) {
+ return;
+ }
+ }
}
});
|
small fix for the schema editor so that property deletion is a little bit more robust
before you could add properties with certain names and not be able to remove them at all
|
diff --git a/resources/lang/it-IT/dashboard.php b/resources/lang/it-IT/dashboard.php
index <HASH>..<HASH> 100644
--- a/resources/lang/it-IT/dashboard.php
+++ b/resources/lang/it-IT/dashboard.php
@@ -35,6 +35,7 @@ return [
'failure' => 'Something went wrong updating the incident update',
],
],
+ 'reported_by' => 'Reported by :user',
'add' => [
'title' => 'Riporta un problema',
'success' => 'Segnalazione aggiunta.',
|
New translations dashboard.php (Italian)
|
diff --git a/gitlab/objects.py b/gitlab/objects.py
index <HASH>..<HASH> 100644
--- a/gitlab/objects.py
+++ b/gitlab/objects.py
@@ -1290,10 +1290,6 @@ class ProjectTagRelease(GitlabObject):
shortPrintAttr = 'description'
-class ProjectTagReleaseManager(BaseManager):
- obj_cls = ProjectTagRelease
-
-
class ProjectTag(GitlabObject):
_url = '/projects/%(project_id)s/repository/tags'
_constructorTypes = {'release': 'ProjectTagRelease',
|
Remove unused ProjectTagReleaseManager class
|
diff --git a/pkg/identity/cache.go b/pkg/identity/cache.go
index <HASH>..<HASH> 100644
--- a/pkg/identity/cache.go
+++ b/pkg/identity/cache.go
@@ -120,9 +120,15 @@ func LookupReservedIdentity(lbls labels.Labels) *Identity {
return nil
}
+var unknownIdentity = NewIdentity(IdentityUnknown, labels.Labels{labels.IDNameUnknown: labels.NewLabel(labels.IDNameUnknown, "", labels.LabelSourceReserved)})
+
// LookupIdentityByID returns the identity by ID. This function will first
// search through the local cache and fall back to querying the kvstore.
func LookupIdentityByID(id NumericIdentity) *Identity {
+ if id == IdentityUnknown {
+ return unknownIdentity
+ }
+
if identity, ok := reservedIdentityCache[id]; ok {
return identity
}
diff --git a/pkg/labels/labels.go b/pkg/labels/labels.go
index <HASH>..<HASH> 100644
--- a/pkg/labels/labels.go
+++ b/pkg/labels/labels.go
@@ -47,6 +47,10 @@ const (
// IDNameInit is the label used to identify any endpoint that has not
// received any labels yet.
IDNameInit = "init"
+
+ // IDNameUnknown is the label used to to idenfity an endpoint with an
+ // unknown identity.
+ IDNameUnknown = "unknown"
)
// OpLabels represents the the possible types.
|
identity: Resolve unknown identity to label reserved:unknown
```
$ cilium identity get 0
ID LABELS
0 reserved:unknown
```
Fixes: #<I>
|
diff --git a/spec/graphql/schema/field_spec.rb b/spec/graphql/schema/field_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/graphql/schema/field_spec.rb
+++ b/spec/graphql/schema/field_spec.rb
@@ -174,7 +174,6 @@ describe GraphQL::Schema::Field do
use(GraphQL::Analysis::AST)
end
- focus
it "provides metadata about arguments" do
res = ArgumentDetailsSchema.execute("{ argumentDetails }")
expected_strs = [
|
Remove focus, ya dummy
|
diff --git a/packages/react/src/components/TileGroup/TileGroup.js b/packages/react/src/components/TileGroup/TileGroup.js
index <HASH>..<HASH> 100644
--- a/packages/react/src/components/TileGroup/TileGroup.js
+++ b/packages/react/src/components/TileGroup/TileGroup.js
@@ -127,7 +127,9 @@ export default class TileGroup extends React.Component {
return (
<fieldset className={className} disabled={disabled}>
{this.renderLegend(legend)}
- {this.getRadioTiles()}
+ <div>
+ {this.getRadioTiles()}
+ </div>
</fieldset>
);
}
|
fix(TileGroup): Wrap RadioTiles inside TileGroup (#<I>)
* Wrap RadioTiles inside TileGroup
This adds a wrapper div element around the RadioTiles inside the TileGroup component so that a flex layout can be applied to the tiles to make them render horizontally.
* Remove the className on the wrapper div
|
diff --git a/components/datepicker/index.js b/components/datepicker/index.js
index <HASH>..<HASH> 100644
--- a/components/datepicker/index.js
+++ b/components/datepicker/index.js
@@ -269,7 +269,9 @@ export default class Datepicker extends Intact {
const input = this.refs.input;
input.focus();
setTimeout(() => {
- input.blur();
+ if (!this.destroyed) {
+ input.blur();
+ }
});
}
}
|
fix(Datepicker): does not focus when destroyed
|
diff --git a/Model/Behavior/UploadBehavior.php b/Model/Behavior/UploadBehavior.php
index <HASH>..<HASH> 100644
--- a/Model/Behavior/UploadBehavior.php
+++ b/Model/Behavior/UploadBehavior.php
@@ -1902,7 +1902,7 @@ class UploadBehavior extends ModelBehavior {
return $this->__filesToRemove;
}
- $DS = empty($dir) ? '' : DIRECTORY_SEPARATOR;
+ $DIRECTORY_SEPARATOR = empty($dir) ? '' : DIRECTORY_SEPARATOR;
$mimeType = $this->_getMimeType($filePath);
$isMedia = $this->_isMedia($model, $mimeType);
$isImagickResize = $options['thumbnailMethod'] == 'imagick';
@@ -1950,7 +1950,7 @@ class UploadBehavior extends ModelBehavior {
'geometry', 'size', 'thumbnailPath'
));
- $thumbnailFilePath = "{$thumbnailPath}{$dir}{$DS}{$fileName}.{$thumbnailType}";
+ $thumbnailFilePath = "{$thumbnailPath}{$dir}{$DIRECTORY_SEPARATOR}{$fileName}.{$thumbnailType}";
$this->__filesToRemove[$model->alias][] = $thumbnailFilePath;
}
return $this->__filesToRemove;
|
rename variable to conform with variable naming
|
diff --git a/src/models/Link.php b/src/models/Link.php
index <HASH>..<HASH> 100644
--- a/src/models/Link.php
+++ b/src/models/Link.php
@@ -16,12 +16,7 @@ class Link extends \hipanel\base\Model
{
use \hipanel\base\ModelTrait;
- public static function index()
- {
- return 'ips';
- }
-
- public static function type()
+ public static function from()
{
return 'ip';
}
|
changed index/type -> `from` in ActiveRecord
|
diff --git a/src/Fracture/Routing/Route.php b/src/Fracture/Routing/Route.php
index <HASH>..<HASH> 100644
--- a/src/Fracture/Routing/Route.php
+++ b/src/Fracture/Routing/Route.php
@@ -20,6 +20,14 @@ class Route implements Matchable
}
+ /**
+ * Method attempts to apply the generated regexp to the URI
+ * and, if successful, returns a list of parsed parameters.
+ *
+ * @param string $uri
+ *
+ * @return array|false
+ */
public function getMatch($uri)
{
$expression = $this->pattern->getExpression();
|
minor: adding some doc-block comments
|
diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index <HASH>..<HASH> 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -124,6 +124,8 @@
var self = this;
var doc = findDoc(this, cm.getDoc());
var request = buildRequest(this, doc, query, pos);
+ var extraOptions = request.query && this.options.queryOptions && this.options.queryOptions[request.query.type]
+ if (extraOptions) for (var prop in extraOptions) request.query[prop] = extraOptions[prop];
this.server.request(request, function (error, data) {
if (!error && self.options.responseFilter)
|
[tern addon] Support a queryOptions option that allows configuring queries
Issue #<I>
|
diff --git a/test/src/error.js b/test/src/error.js
index <HASH>..<HASH> 100644
--- a/test/src/error.js
+++ b/test/src/error.js
@@ -34,6 +34,7 @@ const macro = (t, SpecificError) => {
},
{instanceOf: SpecificError},
);
+ t.is(SpecificError.captureStackTrace, Error.captureStackTrace);
};
macro.title = (title, SpecificError) => title || new SpecificError().name;
|
:test_tube: test: Test that captureStackTrace is present on extended errors.
|
diff --git a/brontide/noise.go b/brontide/noise.go
index <HASH>..<HASH> 100644
--- a/brontide/noise.go
+++ b/brontide/noise.go
@@ -338,7 +338,7 @@ type BrontideMachine struct {
func NewBrontideMachine(initiator bool, localPub *btcec.PrivateKey,
remotePub *btcec.PublicKey) *BrontideMachine {
- handshake := newHandshakeState(initiator, []byte("bitcoin"), localPub,
+ handshake := newHandshakeState(initiator, []byte("lightning"), localPub,
remotePub)
return &BrontideMachine{handshakeState: handshake}
|
brontide: set the prologue value as specified within BOLT<I>
|
diff --git a/invenio_previewer/webpack.py b/invenio_previewer/webpack.py
index <HASH>..<HASH> 100644
--- a/invenio_previewer/webpack.py
+++ b/invenio_previewer/webpack.py
@@ -46,7 +46,7 @@ previewer = WebpackThemeBundle(
'./scss/invenio_previewer/simple_image.scss',
},
dependencies={
- 'bootstrap-sass': '~3.4.0',
+ 'bootstrap-sass': '~3.3.5',
'd3': '^3.5.17',
'flightjs': '~1.5.1',
'font-awesome': '~4.5.0',
|
webpack: align version with Invenio-theme
|
diff --git a/lib/Psc/Code/Test/Base.php b/lib/Psc/Code/Test/Base.php
index <HASH>..<HASH> 100644
--- a/lib/Psc/Code/Test/Base.php
+++ b/lib/Psc/Code/Test/Base.php
@@ -8,6 +8,7 @@ use Webforge\Common\System\File;
use Closure;
use Psc\PHPUnit\InvokedAtMethodIndexMatcher;
use Psc\PHPUnit\InvokedAtMethodGroupIndexMatcher;
+use Psc\System\Console\Process;
/**
* Der Base-TestCase
@@ -246,5 +247,26 @@ class Base extends AssertionsBase {
{
return new InvokedAtMethodGroupIndexMatcher($groupIndex, $method, $methodGroup);
}
+
+ /**
+ * @return Psc\System\Console\Process
+ */
+ public function runPHPFile(File $phpFile) {
+ $phpBin = SystemUtil::findPHPBinary();
+
+ $process = Process::build($phpBin, array(), array('f'=>$phpFile))->end();
+ $process->run();
+
+ $this->assertTrue($process->isSuccessful(),
+ sprintf("process for phpfile '%s' did not return 0.\ncmd:\n%s\nerr:\n%s\nout:\n%s\n",
+ $phpFile,
+ $process->getCommandLine(),
+ $process->getErrorOutput(),
+ $process->getOutput()
+ )
+ );
+
+ return $process;
+ }
}
?>
\ No newline at end of file
|
add runPHpFile to base
|
diff --git a/litho-glide/src/main/java/com/github/pavlospt/litho/glide/GlideImageSpec.java b/litho-glide/src/main/java/com/github/pavlospt/litho/glide/GlideImageSpec.java
index <HASH>..<HASH> 100644
--- a/litho-glide/src/main/java/com/github/pavlospt/litho/glide/GlideImageSpec.java
+++ b/litho-glide/src/main/java/com/github/pavlospt/litho/glide/GlideImageSpec.java
@@ -1,5 +1,6 @@
package com.github.pavlospt.litho.glide;
+import android.content.Context;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.widget.ImageView;
@@ -24,7 +25,6 @@ import com.facebook.litho.utils.MeasureUtils;
import java.io.File;
import static com.facebook.litho.annotations.ResType.DRAWABLE;
-import static com.facebook.litho.annotations.ResType.INT;
@MountSpec
public class GlideImageSpec {
@@ -45,8 +45,8 @@ public class GlideImageSpec {
}
@OnCreateMountContent
- static ImageView onCreateMountContent(ComponentContext c) {
- return new ImageView(c.getBaseContext());
+ static ImageView onCreateMountContent(Context c) {
+ return new ImageView(c);
}
@OnMount
|
Fix API change after Litho version bump
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -2,12 +2,12 @@ from setuptools import setup
setup(
name='pyconfluence',
packages=['pyconfluence'],
- version='1.1.2',
+ version='1.1.3',
description='An API wrapper for Atlassian Confluence',
author='Caleb Hawkins',
author_email='hawkins.caleb93@gmail.com',
url='https://github.com/FulcrumIT/pyconfluence',
- download_url='https://github.com/FulcrumIT/pyconfluence/tarball/1.1.2',
+ download_url='https://github.com/FulcrumIT/pyconfluence/tarball/1.1.3',
keywords=['confluence'],
classifiers=[],
)
|
Prepping for release <I>
|
diff --git a/src/di/parser.js b/src/di/parser.js
index <HASH>..<HASH> 100644
--- a/src/di/parser.js
+++ b/src/di/parser.js
@@ -3,7 +3,7 @@
var args = require('./args');
var isArray = Array.isArray;
-var tokens = function (fn, deps) {
+var validTokens = function (fn, deps) {
if (typeof fn !== 'function') {
throw 'invalid injectable function';
}
@@ -18,19 +18,19 @@ var tokens = function (fn, deps) {
var inlineArrayParser = function (injectable) {
var fn = injectable.pop();
var deps = injectable;
- return tokens(fn, deps);
+ return validTokens(fn, deps);
};
var $injectParser = function (injectable) {
var fn = injectable;
var deps = fn.$inject;
- return tokens(fn, deps);
+ return validTokens(fn, deps);
};
var fnParamParser = function (injectable) {
var fn = injectable;
var deps = args(fn);
- return tokens(fn, deps);
+ return validTokens(fn, deps);
};
var parser = function (injectable) {
|
[min] renamed internal function
|
diff --git a/packages/webpack/mixins/render/mixin.core.js b/packages/webpack/mixins/render/mixin.core.js
index <HASH>..<HASH> 100644
--- a/packages/webpack/mixins/render/mixin.core.js
+++ b/packages/webpack/mixins/render/mixin.core.js
@@ -57,7 +57,7 @@ class WebpackRenderMixin extends Mixin {
describe: 'Statically build locations',
type: 'boolean',
};
- if (command === 'start') {
+ if (command === 'start' && process.env.NODE_ENV !== 'production') {
builder.static.implies = ['static', 'production'];
builder.static.describe += ' (requires --production, -p)';
}
|
fix(webpack): allow "start -s" when NODE_ENV=production
|
diff --git a/scripts/src/main/javascript/org/hisrc/jsonix/Jsonix/Model/ElementRefPropertyInfo.js b/scripts/src/main/javascript/org/hisrc/jsonix/Jsonix/Model/ElementRefPropertyInfo.js
index <HASH>..<HASH> 100644
--- a/scripts/src/main/javascript/org/hisrc/jsonix/Jsonix/Model/ElementRefPropertyInfo.js
+++ b/scripts/src/main/javascript/org/hisrc/jsonix/Jsonix/Model/ElementRefPropertyInfo.js
@@ -28,9 +28,6 @@ Jsonix.Model.ElementRefPropertyInfo = Jsonix
getPropertyElementTypeInfo : function(elementName) {
Jsonix.Util.Ensure.ensureObject(elementName);
var name = Jsonix.XML.QName.fromObject(elementName);
- logger.info('>1>' + name.key);
- logger.info('>2>' + this.elementName.key);
- logger.info('>3>' + this.wrapperElementName);
if (name.key === this.elementName.key) {
return this;
|
Removed the debug log statements.
|
diff --git a/src/Api/Providers/Provider.php b/src/Api/Providers/Provider.php
index <HASH>..<HASH> 100644
--- a/src/Api/Providers/Provider.php
+++ b/src/Api/Providers/Provider.php
@@ -57,8 +57,7 @@ abstract class Provider
*/
public function execPostRequest($requestOptions, $resourceUrl, $returnData = false)
{
- $data = ['options' => $requestOptions];
- $postString = Request::createQuery($data);
+ $postString = Request::createQuery(['options' => $requestOptions]);
$response = $this->request->exec($resourceUrl, $postString);
if ($returnData) {
@@ -70,11 +69,9 @@ abstract class Provider
public function execGetRequest($requestOptions, $resourceUrl, $needsPagination = false, $bookmarks = [])
{
- $query = Request::createQuery(
- ['options' => $requestOptions], '', $bookmarks
- );
-
+ $query = Request::createQuery(['options' => $requestOptions], '', $bookmarks);
$response = $this->request->exec($resourceUrl . "?{$query}");
+
if ($needsPagination) {
return $this->response->getPaginationData($response);
}
|
upd: Provider requests refactoring
|
diff --git a/lib/index.js b/lib/index.js
index <HASH>..<HASH> 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -275,7 +275,7 @@ lunr.Index.prototype.query = function (fn) {
* for the term we are working with. In that case we just add the scores
* together.
*/
- queryVectors[field].upsert(termIndex, 1 * clause.boost, function (a, b) { return a + b })
+ queryVectors[field].upsert(termIndex, clause.boost, function (a, b) { return a + b })
/**
* If we've already seen this term, field combo then we've already collected
|
Remove redundant multiplication
clause.boost will always be a number and has a sensible default of 1.
Multiplying the boost by 1 is redundant. Removing this redundant
multiplication had a small, but measurable, positive impact on benchmark
results.
|
diff --git a/pyrsistent/_immutable.py b/pyrsistent/_immutable.py
index <HASH>..<HASH> 100644
--- a/pyrsistent/_immutable.py
+++ b/pyrsistent/_immutable.py
@@ -98,6 +98,6 @@ class {class_name}(namedtuple('ImmutableBase', [{quoted_members}]{verbose_string
try:
exec(template, namespace)
except SyntaxError as e:
- raise SyntaxError(e.message + ':\n' + template) from e
+ raise SyntaxError(str(e) + ':\n' + template) from e
return namespace[name]
|
Stop using exception.message
<URL>. As of Python <I>, exception.message was dropped, and attempting to access it causes an error.
|
diff --git a/internal/pipe/snapcraft/snapcraft.go b/internal/pipe/snapcraft/snapcraft.go
index <HASH>..<HASH> 100644
--- a/internal/pipe/snapcraft/snapcraft.go
+++ b/internal/pipe/snapcraft/snapcraft.go
@@ -201,14 +201,12 @@ func (Pipe) Publish(ctx *context.Context) error {
return pipe.ErrSkipPublishEnabled
}
snaps := ctx.Artifacts.Filter(artifact.ByType(artifact.PublishableSnapcraft)).List()
- g := semerrgroup.New(ctx.Parallelism)
for _, snap := range snaps {
- snap := snap
- g.Go(func() error {
- return push(ctx, snap)
- })
+ if err := push(ctx, snap); err != nil {
+ return err
+ }
}
- return g.Wait()
+ return nil
}
func create(ctx *context.Context, snap config.Snapcraft, arch string, binaries []*artifact.Artifact) error {
|
fix: do not push snaps concurrently (#<I>)
It seems that the error I get sometimes (#<I>) is related to snap push
not being able to work concurrently.
I'm not a <I>% sure though, so I'll try this and see how it goes.
If the error still happens, we can ignore the error or retry.
closes #<I>
|
diff --git a/lib/services/role.go b/lib/services/role.go
index <HASH>..<HASH> 100644
--- a/lib/services/role.go
+++ b/lib/services/role.go
@@ -117,8 +117,6 @@ func NewImplicitRole() Role {
},
Allow: RoleConditions{
Namespaces: []string{defaults.Namespace},
- Logins: []string{teleport.TraitInternalRoleVariable},
- NodeLabels: map[string]string{Wildcard: Wildcard},
Rules: CopyRulesSlice(DefaultImplicitRules),
},
},
|
Remove allowed logins and labels from implicit role.
|
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
index <HASH>..<HASH> 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -211,7 +211,7 @@ module ActiveRecord
# calling +checkout+ on this pool.
def checkin(conn)
@connection_mutex.synchronize do
- conn._run_checkin_callbacks do
+ conn.send(:_run_checkin_callbacks) do
@checked_out.delete conn
@queue.signal
end
|
Whoops. _run_*_callbacks is private
|
diff --git a/trakt/client.py b/trakt/client.py
index <HASH>..<HASH> 100644
--- a/trakt/client.py
+++ b/trakt/client.py
@@ -6,7 +6,7 @@ from trakt.interfaces.base import InterfaceProxy
import logging
-__version__ = '2.2.0'
+__version__ = '2.3.0'
log = logging.getLogger(__name__)
|
Bumped version to <I>
|
diff --git a/typescript-generator-maven-plugin/src/main/java/cz/habarta/typescript/generator/maven/GenerateMojo.java b/typescript-generator-maven-plugin/src/main/java/cz/habarta/typescript/generator/maven/GenerateMojo.java
index <HASH>..<HASH> 100644
--- a/typescript-generator-maven-plugin/src/main/java/cz/habarta/typescript/generator/maven/GenerateMojo.java
+++ b/typescript-generator-maven-plugin/src/main/java/cz/habarta/typescript/generator/maven/GenerateMojo.java
@@ -14,7 +14,7 @@ import org.apache.maven.project.MavenProject;
* Generates TypeScript declaration file from specified java classes.
* For more information see README and Wiki on GitHub.
*/
-@Mojo(name = "generate", defaultPhase = LifecyclePhase.PROCESS_CLASSES, requiresDependencyResolution = ResolutionScope.COMPILE)
+@Mojo(name = "generate", defaultPhase = LifecyclePhase.PROCESS_CLASSES, requiresDependencyResolution = ResolutionScope.COMPILE, threadSafe = true)
public class GenerateMojo extends AbstractMojo {
/**
|
Mark Maven plugin as `threadSafe`
|
diff --git a/lib/knapsack_pro/runners/base_runner.rb b/lib/knapsack_pro/runners/base_runner.rb
index <HASH>..<HASH> 100644
--- a/lib/knapsack_pro/runners/base_runner.rb
+++ b/lib/knapsack_pro/runners/base_runner.rb
@@ -11,7 +11,7 @@ module KnapsackPro
end
def test_file_paths
- allocator.test_file_paths
+ @test_file_paths ||= allocator.test_file_paths
end
def stringify_test_file_paths
|
Cache API response test file paths to fix problem with double request to get test suite distribution for the node
|
diff --git a/test/test_tools.py b/test/test_tools.py
index <HASH>..<HASH> 100644
--- a/test/test_tools.py
+++ b/test/test_tools.py
@@ -86,7 +86,7 @@ def test_recordplay():
record = Process(target=jps.tools.record, args=(file_path, ['/test_rec2']))
record.start()
- time.sleep(0.1)
+ time.sleep(0.5)
p1 = jps.Publisher('/test_rec1')
p2 = jps.Publisher('/test_rec2')
@@ -104,7 +104,7 @@ def test_recordplay():
assert os.path.exists(file_path)
def print_file_and_check_json(path):
- with open(file_path_all) as f:
+ with open(path) as f:
data = f.read()
print(data)
json.loads(data)
|
Update tests to remove flacky test
|
diff --git a/raft/raft_test.go b/raft/raft_test.go
index <HASH>..<HASH> 100644
--- a/raft/raft_test.go
+++ b/raft/raft_test.go
@@ -476,17 +476,23 @@ func TestDuelingCandidates(t *testing.T) {
nt.send(pb.Message{From: 1, To: 1, Type: pb.MsgHup})
nt.send(pb.Message{From: 3, To: 3, Type: pb.MsgHup})
+ // 1 becomes leader since it receives votes from 1 and 2
sm := nt.peers[1].(*raft)
if sm.state != StateLeader {
t.Errorf("state = %s, want %s", sm.state, StateLeader)
}
+ // 3 stays as candidate since it receives a vote from 3 and a rejection from 2
sm = nt.peers[3].(*raft)
if sm.state != StateCandidate {
t.Errorf("state = %s, want %s", sm.state, StateCandidate)
}
nt.recover()
+
+ // candidate 3 now increases its term and tries to vote again
+ // we expect it to disrupt the leader 1 since it has a higher term
+ // 3 will be follower again since both 1 and 2 rejects its vote request since 3 does not have a long enough log
nt.send(pb.Message{From: 3, To: 3, Type: pb.MsgHup})
wlog := &raftLog{
|
raft: add more comments for dueling candidates test case
|
diff --git a/src/Kunstmaan/AdminListBundle/Exception/ExportException.php b/src/Kunstmaan/AdminListBundle/Exception/ExportException.php
index <HASH>..<HASH> 100644
--- a/src/Kunstmaan/AdminListBundle/Exception/ExportException.php
+++ b/src/Kunstmaan/AdminListBundle/Exception/ExportException.php
@@ -4,7 +4,7 @@ namespace Kunstmaan\AdminListBundle\EventSubscriber;
/**
* class ExportException
*/
-class ExportException extends \RuntimeException implements ExceptionInterface
+class ExportException extends \RuntimeException
{
/** @var mixed */
protected $data;
|
[AdminListBundle] Removed undefined implemented class
[SensiolabsInsight] Removed undefined implemented class
|
diff --git a/chartpress.py b/chartpress.py
index <HASH>..<HASH> 100755
--- a/chartpress.py
+++ b/chartpress.py
@@ -266,7 +266,7 @@ def main():
help='Use this tag for images & charts')
argparser.add_argument('--extra-message', default='',
help='extra message to add to the commit message when publishing charts')
- argparser.add_argument('--set-prefix', default='',
+ argparser.add_argument('--set-prefix', default=None,
help='override image prefix with this value')
args = argparser.parse_args()
@@ -276,7 +276,7 @@ def main():
for chart in config['charts']:
if 'images' in chart:
- image_prefix = args.set_prefix if args.set_prefix != '' else chart['imagePrefix']
+ image_prefix = args.set_prefix if args.set_prefix is not None else chart['imagePrefix']
value_mods = build_images(
prefix=image_prefix,
images=chart['images'],
|
Use None as default for --set-prefix
|
diff --git a/src/common.py b/src/common.py
index <HASH>..<HASH> 100644
--- a/src/common.py
+++ b/src/common.py
@@ -32,7 +32,7 @@ def gridEngineIsInstalled():
"""Returns True if grid-engine is installed, else False.
"""
try:
- return system("qstat -version") == 0
+ return system("qstat -help") == 0
except RuntimeError:
return False
|
Fix to function to check if grid engine is present
|
diff --git a/src/index.js b/src/index.js
index <HASH>..<HASH> 100644
--- a/src/index.js
+++ b/src/index.js
@@ -23,6 +23,7 @@ module.exports = function (Model, defaultInput) {
signals[arguments[0]] = signalFactory.apply(null, arguments);
};
+ controller.defaultInput = defaultInput;
controller.signals = signals;
controller.store = signalStore;
controller.recorder = recorder;
|
Exposing defaultInput due to Angular view package
|
diff --git a/src/Cache/Pool.php b/src/Cache/Pool.php
index <HASH>..<HASH> 100644
--- a/src/Cache/Pool.php
+++ b/src/Cache/Pool.php
@@ -50,6 +50,7 @@ class Pool implements CacheItemPoolInterface
public static function persist()
{
file_put_contents(self::$path, serialize(self::$cache));
+ chmod(self::$path, 0666);
}
public function __wakeup()
@@ -57,8 +58,7 @@ class Pool implements CacheItemPoolInterface
if (file_exists(self::$path)) {
self::$cache = unserialize(file_get_contents(self::$path));
} else {
- file_put_contents(self::$path, serialize(self::$cache));
- chmod(self::$path, 0666);
+ self::persist();
}
}
@@ -123,8 +123,7 @@ class Pool implements CacheItemPoolInterface
public function save(CacheItemInterface $item)
{
self::$cache[$item->getKey()] = $item;
- file_put_contents(self::$path, serialize(self::$cache));
- chmod(self::$path, 0666);
+ self::persist();
return true;
}
|
we actually had a generic method for that
|
diff --git a/Generator/FormattingTrait/AnnotationTrait.php b/Generator/FormattingTrait/AnnotationTrait.php
index <HASH>..<HASH> 100644
--- a/Generator/FormattingTrait/AnnotationTrait.php
+++ b/Generator/FormattingTrait/AnnotationTrait.php
@@ -51,7 +51,7 @@ trait AnnotationTrait {
$docblock_lines[] = str_repeat(' ', $indent)
. $key
. ' = '
- . "@{$value['#class']}(\"" . $value['#data'] . '")';
+ . "@{$value['#class']}(\"" . $value['#data'] . '"),';
}
}
else {
|
Fixed missing comma in annotation lines that have a class.
|
diff --git a/RAPIDpy/gis/taudem.py b/RAPIDpy/gis/taudem.py
index <HASH>..<HASH> 100644
--- a/RAPIDpy/gis/taudem.py
+++ b/RAPIDpy/gis/taudem.py
@@ -32,7 +32,8 @@ class TauDEM(object):
def __init__(self,
taudem_exe_path="",
num_processors=1,
- use_all_processors=False):
+ use_all_processors=False,
+ mpiexec_path="mpiexec"):
"""
Initializer
"""
@@ -41,6 +42,7 @@ class TauDEM(object):
self.taudem_exe_path = taudem_exe_path
self.num_processors = num_processors
+ self.mpiexec_path = mpiexec_path
def _run_mpi_cmd(self, cmd):
"""
@@ -53,7 +55,7 @@ class TauDEM(object):
time_start = datetime.utcnow()
# Construct the taudem command line.
- cmd = ['mpiexec', '-n', str(self.num_processors)] + cmd
+ cmd = [self.mpiexec_path, '-n', str(self.num_processors)] + cmd
print("Command Line: {0}".format(" ".join(cmd)))
process = Popen(cmd, stdout=PIPE, stderr=PIPE, shell=False)
out, err = process.communicate()
|
allow for different mpiexec
|
diff --git a/findbugs/src/java/edu/umd/cs/findbugs/detect/FindSelfComparison2.java b/findbugs/src/java/edu/umd/cs/findbugs/detect/FindSelfComparison2.java
index <HASH>..<HASH> 100644
--- a/findbugs/src/java/edu/umd/cs/findbugs/detect/FindSelfComparison2.java
+++ b/findbugs/src/java/edu/umd/cs/findbugs/detect/FindSelfComparison2.java
@@ -162,7 +162,7 @@ public class FindSelfComparison2 implements Detector {
annotation = FindNullDeref.findLocalAnnotationFromValueNumber(methodGen.getMethod(), location, v0, frame);
prefix = "SA_LOCAL_SELF_" ;
}
-
+ if (annotation == null) return;
BugInstance bug = new BugInstance(this, prefix + op, priority).addClassAndMethod(methodGen, sourceFile)
.add(annotation).addSourceLine(classContext, methodGen, sourceFile, location.getHandle());
bugReporter.reportBug(bug);
|
don't report self operation if we can't name the thing being compared
git-svn-id: <URL>
|
diff --git a/framework/console/controllers/BaseMigrateController.php b/framework/console/controllers/BaseMigrateController.php
index <HASH>..<HASH> 100644
--- a/framework/console/controllers/BaseMigrateController.php
+++ b/framework/console/controllers/BaseMigrateController.php
@@ -52,7 +52,7 @@ abstract class BaseMigrateController extends Controller
*
* @see $migrationNamespaces
*/
- public $migrationPath = '@app/migrations';
+ public $migrationPath = ['@app/migrations'];
/**
* @var array list of namespaces containing the migration classes.
*
|
Update BaseMigrateController.php
make sure console arguments are recognized as array.
|
diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java b/src/java/org/apache/cassandra/tools/NodeTool.java
index <HASH>..<HASH> 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -2066,7 +2066,7 @@ public class NodeTool
StringBuffer errors = new StringBuffer();
- Map<InetAddress, Float> ownerships;
+ Map<InetAddress, Float> ownerships = null;
try
{
ownerships = probe.effectiveOwnership(keyspace);
@@ -2079,7 +2079,7 @@ public class NodeTool
catch (IllegalArgumentException ex)
{
System.out.printf("%nError: " + ex.getMessage() + "%n");
- return;
+ System.exit(1);
}
Map<String, SetHostStat> dcs = getOwnershipByDc(probe, resolveIp, tokensToEndpoints, ownerships);
|
Fix exit code in nodetool when keyspace does not exist.
Patch by Sachin Janani, reviewed by brandonwilliams for CASSANDRA-<I>
|
diff --git a/src/EmojiDictionary.php b/src/EmojiDictionary.php
index <HASH>..<HASH> 100644
--- a/src/EmojiDictionary.php
+++ b/src/EmojiDictionary.php
@@ -1831,6 +1831,9 @@ class EmojiDictionary
*/
public static function get($symbol)
{
+
+ $symbol = strtolower($symbol);
+
if (isset(static::$dictionary[$symbol]))
return static::$dictionary[$symbol];
else
|
Symbol reference is always converted to lower case
|
diff --git a/bzr_exporter.py b/bzr_exporter.py
index <HASH>..<HASH> 100755
--- a/bzr_exporter.py
+++ b/bzr_exporter.py
@@ -130,10 +130,12 @@ class BzrFastExporter(object):
# Get the primary parent
if nparents == 0:
- # This is a parentless commit. We need to create a new branch
- # otherwise git-fast-import will assume the previous commit
- # was this one's parent
- git_branch = self.next_available_branch_name()
+ if ncommits:
+ # This is a parentless commit but it's not the first one
+ # output. We need to create a new temporary branch for it
+ # otherwise git-fast-import will assume the previous commit
+ # was this one's parent
+ git_branch = self._next_tmp_branch_name()
parent = bzrlib.revision.NULL_REVISION
else:
parent = revobj.parent_ids[0]
@@ -257,7 +259,7 @@ class BzrFastExporter(object):
git_ref = 'refs/tags/%s' % tag
self.print_cmd(commands.ResetCommand(git_ref, ":" + mark))
- def next_available_branch_name(self):
+ def _next_tmp_branch_name(self):
"""Return a unique branch name. The name will start with "tmp"."""
prefix = 'tmp'
if prefix not in self.branch_names:
|
fix branch of first commit to not be refs/heads/tmp
|
diff --git a/jaulp.wicket.components/src/main/java/de/alpharogroup/wicket/components/listview/ListViewPanel.java b/jaulp.wicket.components/src/main/java/de/alpharogroup/wicket/components/listview/ListViewPanel.java
index <HASH>..<HASH> 100644
--- a/jaulp.wicket.components/src/main/java/de/alpharogroup/wicket/components/listview/ListViewPanel.java
+++ b/jaulp.wicket.components/src/main/java/de/alpharogroup/wicket/components/listview/ListViewPanel.java
@@ -110,6 +110,7 @@ public abstract class ListViewPanel<T> extends GenericPanel<List<T>>
item.add(newListComponent("item", item));
}
};
+ listView.setReuseItems(true);
return listView;
}
|
set flag 'reuseItems' to true to all ListView's.
|
diff --git a/lib/ronin/platform/overlay_cache.rb b/lib/ronin/platform/overlay_cache.rb
index <HASH>..<HASH> 100644
--- a/lib/ronin/platform/overlay_cache.rb
+++ b/lib/ronin/platform/overlay_cache.rb
@@ -53,7 +53,13 @@ module Ronin
if descriptions.kind_of?(Array)
descriptions.each do |overlay|
if overlay.kind_of?(Hash)
- add(Overlay.new(overlay[:path],overlay[:media],overlay[:uri]))
+ overlay = Overlay.new(
+ overlay[:path],
+ overlay[:media],
+ overlay[:uri]
+ )
+
+ self[overlay.name] = overlay
end
end
end
|
Don't use OverlayCache#add to populate the cache.
|
diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index <HASH>..<HASH> 100644
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -808,7 +808,7 @@ class global_navigation extends navigation_node {
* @return bool
*/
public function initialise() {
- global $SITE, $USER;
+ global $CFG, $SITE, $USER;
// Check if it has alread been initialised
if ($this->initialised || during_initial_install()) {
return true;
@@ -912,6 +912,18 @@ class global_navigation extends navigation_node {
}
}
+ // Give the local plugins a chance to include some navigation if they want.
+ foreach (get_list_of_plugins('local') as $plugin) {
+ if (!file_exists($CFG->dirroot.'/local/'.$plugin.'/lib.php')) {
+ continue;
+ }
+ require_once($CFG->dirroot.'/local/'.$plugin.'/lib.php');
+ $function = $plugin.'_extends_navigation';
+ if (function_exists($function)) {
+ $function($this);
+ }
+ }
+
// Remove any empty root nodes
foreach ($this->rootnodes as $node) {
if (!$node->has_children()) {
|
navigation MDL-<I> Added a callback for local plugins to allow them to add to the navigation.
|
diff --git a/lib/request_log_analyzer/file_format/apache.rb b/lib/request_log_analyzer/file_format/apache.rb
index <HASH>..<HASH> 100644
--- a/lib/request_log_analyzer/file_format/apache.rb
+++ b/lib/request_log_analyzer/file_format/apache.rb
@@ -55,7 +55,7 @@ module RequestLogAnalyzer::FileFormat
# Creates the access log line definition based on the Apache log format string
def self.access_line_definition(format_string)
- format_string ||= :combined
+ format_string ||= :common
format_string = LOG_FORMAT_DEFAULTS[format_string.to_sym] || format_string
line_regexp = ''
|
Use Apache common access log format by default as it will work in more cases
|
diff --git a/statsd/event.go b/statsd/event.go
index <HASH>..<HASH> 100644
--- a/statsd/event.go
+++ b/statsd/event.go
@@ -37,7 +37,7 @@ const (
type Event struct {
// Title of the event. Required.
Title string
- // Text is the description of the event. Required.
+ // Text is the description of the event.
Text string
// Timestamp is a timestamp for the event. If not provided, the dogstatsd
// server will set this to the current time.
|
update event doc comment (#<I>)
|
diff --git a/src/de/unihd/dbs/uima/annotator/heideltime/HeidelTime.java b/src/de/unihd/dbs/uima/annotator/heideltime/HeidelTime.java
index <HASH>..<HASH> 100644
--- a/src/de/unihd/dbs/uima/annotator/heideltime/HeidelTime.java
+++ b/src/de/unihd/dbs/uima/annotator/heideltime/HeidelTime.java
@@ -1421,7 +1421,7 @@ public class HeidelTime extends JCasAnnotator_ImplBase {
valueNew = valueNew.replace(checkUndef, lmYearOnly-1+"-Q4");
} else {
int newQuarter = lmQuarterOnly-1;
- valueNew = valueNew.replace(checkUndef, dctYear+"-Q"+newQuarter);
+ valueNew = valueNew.replace(checkUndef, lmYearOnly+"-Q"+newQuarter);
}
}
}
|
minor bugfix for quarter disambiguation
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,5 @@
# Always prefer setuptools over distutils
-from setuptools import setup
+from setuptools import setup, find_packages
# To use a consistent encoding
from codecs import open as opn
from os import path
@@ -26,7 +26,8 @@ setup(name='lebot-cerebro',
author='LeBot',
author_email='sanket.upadhyay@infoud.co.in',
license='MIT',
- packages=['cerebro'],
+ packages=['cerebro']+find_packages(),
+ package_data={'': ['*.csv'], 'cerebro.data': ['datasets/*.csv']},
install_requires=[
'scikit-learn',
'scipy',
|
Setup.py updated to include all the subpackages and data sets
|
diff --git a/lib/Thelia/Model/Customer.php b/lib/Thelia/Model/Customer.php
index <HASH>..<HASH> 100644
--- a/lib/Thelia/Model/Customer.php
+++ b/lib/Thelia/Model/Customer.php
@@ -263,6 +263,13 @@ class Customer extends BaseCustomer implements UserInterface
return $this;
}
+ public function erasePassword()
+ {
+ parent::setPassword(null);
+
+ return $this;
+ }
+
/*
public function setRef($ref)
{
|
Add a function to erase a customer password (#<I>)
* Add a function to erase a customer password
* Fix cs
|
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/default.rb b/kitchen-tests/cookbooks/end_to_end/recipes/default.rb
index <HASH>..<HASH> 100644
--- a/kitchen-tests/cookbooks/end_to_end/recipes/default.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/default.rb
@@ -52,7 +52,6 @@ users_manage "sysadmin" do
end
ssh_known_hosts_entry "github.com"
-ssh_known_hosts_entry "localhost"
sudo "sysadmins" do
group ["sysadmin", "%superadmin"]
|
this just isn't working at all on fedora
|
diff --git a/samtranslator/parser/parser.py b/samtranslator/parser/parser.py
index <HASH>..<HASH> 100644
--- a/samtranslator/parser/parser.py
+++ b/samtranslator/parser/parser.py
@@ -63,7 +63,7 @@ class Parser:
validation_errors = validator.validate(sam_template)
if validation_errors:
- LOG.warn("Template schema validation reported the following errors: " + ", ".join(validation_errors))
+ LOG.warning("Template schema validation reported the following errors: %s", validation_errors)
except Exception as e:
# Catching any exception and not re-raising to make sure any validation process won't break transform
LOG.exception("Exception from SamTemplateValidator: %s", e)
|
fix: fix validation errors log message that calls join on a string (#<I>)
|
diff --git a/admin/resource.go b/admin/resource.go
index <HASH>..<HASH> 100644
--- a/admin/resource.go
+++ b/admin/resource.go
@@ -57,6 +57,7 @@ func (res *Resource) setBaseResource(base *Resource) {
findManyHandle := res.FindManyHandler
res.FindManyHandler = func(value interface{}, context *qor.Context) error {
+ base.FindOneHandler(value, nil, context.Clone())
return findManyHandle(value, context)
}
diff --git a/context.go b/context.go
index <HASH>..<HASH> 100644
--- a/context.go
+++ b/context.go
@@ -21,6 +21,11 @@ type Context struct {
Errors
}
+func (context *Context) Clone() *Context {
+ var clone = *context
+ return &clone
+}
+
func (context *Context) GetDB() *gorm.DB {
if context.DB != nil {
return context.DB
|
Add method to clone qor context
|
diff --git a/keyboard/__init__.py b/keyboard/__init__.py
index <HASH>..<HASH> 100644
--- a/keyboard/__init__.py
+++ b/keyboard/__init__.py
@@ -136,7 +136,7 @@ def matches(event, name):
or 'right ' + normalized == event.name
)
- return matched_name or _os_keyboard.map_char(name)[0] == event.scan_code
+ return matched_name or _os_keyboard.map_char(normalized)[0] == event.scan_code
def is_pressed(key):
"""
|
Slight change to event matching rule to avoid errors
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.